2 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
index 987267f79bf5..a9c661108034 100644
--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data)
 
 void xen_arch_resume(void)
 {
-        smp_call_function(xen_vcpu_notify_restore,
-                               (void *)CLOCK_EVT_NOTIFY_RESUME, 1);
+        on_each_cpu(xen_vcpu_notify_restore,
+                    (void *)CLOCK_EVT_NOTIFY_RESUME, 1);
 }
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;