diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 18:46:09 -0400 |
| commit | b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 (patch) | |
| tree | e1c9325123f19729803a4ce3dc3c5cd7e17469b0 /drivers | |
| parent | f150dba6d4a1e275b62ca76572c2786c71b91e85 (diff) | |
| parent | b3831cb55d383e8eb55d3b56c715fb48459b87c9 (diff) | |
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.c | 2 |
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, | |||
| 499 | #define PRINTF_BUFFER_SIZE 4096 | 499 | #define PRINTF_BUFFER_SIZE 4096 |
| 500 | char *printf_buffer; | 500 | char *printf_buffer; |
| 501 | 501 | ||
| 502 | printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_KERNEL); | 502 | printf_buffer = kmalloc(PRINTF_BUFFER_SIZE, GFP_NOIO | __GFP_HIGH); |
| 503 | if (printf_buffer == NULL) | 503 | if (printf_buffer == NULL) |
| 504 | return -ENOMEM; | 504 | return -ENOMEM; |
| 505 | 505 | ||