ia64/linux-2.6.18-xen.hg

changeset 499:fdb998e79aba

Avoid another allocation on the resume path which can lead to deadlock
if the swap device isn't present yet.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
author Ian Campbell <ian.campbell@citrix.com>
date Fri Mar 28 09:44:51 2008 +0000 (2008-03-28)
parents a8f250d8a3e9
children 0637d22ed554
files drivers/xen/blkfront/blkfront.c
line diff
     1.1 --- a/drivers/xen/blkfront/blkfront.c	Thu Mar 27 17:56:50 2008 +0000
     1.2 +++ b/drivers/xen/blkfront/blkfront.c	Fri Mar 28 09:44:51 2008 +0000
     1.3 @@ -817,7 +817,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 | __GFP_NOFAIL);
     1.8 +	copy = kmalloc(sizeof(info->shadow), GFP_KERNEL | __GFP_NOFAIL | __GFP_HIGH);
     1.9  	memcpy(copy, info->shadow, sizeof(info->shadow));
    1.10  
    1.11  	/* Stage 2: Set up free list. */