From c21a879d3de29c2c59a2a95763b7cbc9235116c8 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 25 May 2010 10:45:35 +0100
Subject: [PATCH] --- yaml --- r: 199743 b: refs/heads/master c:
 b3831cb55d383e8eb55d3b56c715fb48459b87c9 h: refs/heads/master i:   199741:
 474ebd150b6be3ecccecd0fe6bffae043dc41413   199739:
 3111e780fac68b7a4fbba4ac645695972c871ace   199735:
 75e02c65bfd2e49360f55a9962fec84b27fe1411   199727:
 91554766da1b62cf2c56df15a3b534731759bd5d   199711:
 b7989805342ad6142f050cc616e90f949fa6850a   199679:
 813dfd27e1233fdb236c6ea57ba88f738697492f v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/xen/xenbus/xenbus_xs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f17bf50d76d5..0d30441c934d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd52e17ea8278f8449b6174a8e5ed439a2e44ffb
+refs/heads/master: b3831cb55d383e8eb55d3b56c715fb48459b87c9
diff --git a/trunk/drivers/xen/xenbus/xenbus_xs.c b/trunk/drivers/xen/xenbus/xenbus_xs.c
index eab33f1dbdf7..7b547f53f65e 100644
--- a/trunk/drivers/xen/xenbus/xenbus_xs.c
+++ b/trunk/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;