ia64/xen-unstable
changeset 8935:e9e319c61a1e
do not BUG() if memory cannot be allocated, just wait.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author | vhanquez@kneesa.uk.xensource.com |
---|---|
date | Mon Feb 20 17:14:19 2006 +0000 (2006-02-20) |
parents | 011d6df76979 |
children | ff83b29ebe9a |
files | linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c |
line diff
1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Mon Feb 20 17:06:36 2006 +0000 1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Mon Feb 20 17:14:19 2006 +0000 1.3 @@ -726,8 +726,7 @@ static void blkif_recover(struct blkfron 1.4 int j; 1.5 1.6 /* Stage 1: Make a safe copy of the shadow state. */ 1.7 - copy = kmalloc(sizeof(info->shadow), GFP_KERNEL); 1.8 - BUG_ON(copy == NULL); 1.9 + copy = kmalloc(sizeof(info->shadow), GFP_KERNEL | __GFP_NOFAIL); 1.10 memcpy(copy, info->shadow, sizeof(info->shadow)); 1.11 1.12 /* Stage 2: Set up free list. */