evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2010-06-03 15:46:09 -07:00
commit b01b7dc283
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/xen/suspend.c
View file

@ -60,6 +60,6 @@ static void xen_vcpu_notify_restore(void *data)
void xen_arch_resume(void) 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); (void *)CLOCK_EVT_NOTIFY_RESUME, 1);
} }

2
drivers/xen/xenbus/xenbus_xs.c
View file

@ -499,7 +499,7 @@ int xenbus_printf(struct xenbus_transaction t,
#define PRINTF_BUFFER_SIZE 4096 #define PRINTF_BUFFER_SIZE 4096
char *printf_buffer; 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) if (printf_buffer == NULL)
return -ENOMEM; return -ENOMEM;