Commit b01b7dc2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f150dba6 b3831cb5

arch/x86/xen/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data) 


void xen_arch_resume(void)

{

	smp_call_function(xen_vcpu_notify_restore,

	on_each_cpu(xen_vcpu_notify_restore,

		    (void *)CLOCK_EVT_NOTIFY_RESUME, 1);

}

drivers/xen/xenbus/xenbus_xs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;