summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:46:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-03 15:46:09 -0700
commitb01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (patch)
treee1c9325123f19729803a4ce3dc3c5cd7e17469b0 /drivers
parentf150dba6d4a1e275b62ca76572c2786c71b91e85 (diff)
parentb3831cb55d383e8eb55d3b56c715fb48459b87c9 (diff)
downloadlinux-b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2.tar.bz2
Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6
* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6: xen: avoid allocation causing potential swap activity on the resume path xen: ensure timer tick is resumed even on CPU driving the resume
Diffstat (limited to 'drivers')
-rw-r--r--drivers/xen/xenbus/xenbus_xs.c2
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;