git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tridentfb: Blade3D clock fixes
[safe/jmp/linux-2.6]
/
drivers
/
block
/
xen-blkfront.c
diff --git
a/drivers/block/xen-blkfront.c
b/drivers/block/xen-blkfront.c
index
b00682e
..
9ae05c5
100644
(file)
--- a/
drivers/block/xen-blkfront.c
+++ b/
drivers/block/xen-blkfront.c
@@
-584,7
+584,7
@@
static int setup_blkring(struct xenbus_device *dev,
info->ring_ref = GRANT_INVALID_REF;
info->ring_ref = GRANT_INVALID_REF;
- sring = (struct blkif_sring *)__get_free_page(GFP_
KERNEL
);
+ sring = (struct blkif_sring *)__get_free_page(GFP_
NOIO | __GFP_HIGH
);
if (!sring) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
return -ENOMEM;
if (!sring) {
xenbus_dev_fatal(dev, -ENOMEM, "allocating shared ring");
return -ENOMEM;
@@
-741,7
+741,8
@@
static int blkif_recover(struct blkfront_info *info)
int j;
/* Stage 1: Make a safe copy of the shadow state. */
int j;
/* Stage 1: Make a safe copy of the shadow state. */
- copy = kmalloc(sizeof(info->shadow), GFP_KERNEL);
+ copy = kmalloc(sizeof(info->shadow),
+ GFP_NOIO | __GFP_REPEAT | __GFP_HIGH);
if (!copy)
return -ENOMEM;
memcpy(copy, info->shadow, sizeof(info->shadow));
if (!copy)
return -ENOMEM;
memcpy(copy, info->shadow, sizeof(info->shadow));