diff options
| author |   Ian Campbell <ian.campbell@citrix.com> | 2010-05-25 10:45:35 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2010-06-03 09:34:45 +0100 |
| commit | b3831cb55d383e8eb55d3b56c715fb48459b87c9 (patch) | |
| tree | f0f7f26534bca491dc9570f2243df817e982feb4 /drivers/xen | |
| parent | xen: ensure timer tick is resumed even on CPU driving the resume (diff) | |
| download | linux-dev-b3831cb55d383e8eb55d3b56c715fb48459b87c9.tar.xz linux-dev-b3831cb55d383e8eb55d3b56c715fb48459b87c9.zip | |
xen: avoid allocation causing potential swap activity on the resume path
Since the device we are resuming could be the device containing the
swap device we should ensure that the allocation cannot cause
IO.
On resume, this path is triggered when the running system tries to
continue using its devices. If it cannot then the resume will fail;
to try to avoid this we let it dip into the emergency pools.
The majority of these changes were made when linux-2.6.18-xen.hg
changeset e8b49cfbdac0 was ported upstream in
a144ff09bc52ef3f3684ed23eadc9c7c0e57b3aa but somehow this hunk was
dropped.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Stable Kernel <stable@kernel.org> # .32.x
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_xs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index eab33f1dbdf7..7b547f53f65e 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c @@ -499,7 +499,7 @@ int xenbus_printf(struct xenbus_transaction t, #define PRINTF_BUFFER_SIZE 4096 char *printf_buffer; - printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL); + printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_NOIO | __GFP_HIGH); if (printf_buffer == NULL) return -ENOMEM; |