[PATCH][Fix] swsusp: do not trigger BUG_ON() if there is not enough memory

[PATCH][Fix] swsusp: do not trigger BUG_ON() if there is not enough memory

[Rafael J. Wysocki]

Hi,

The following patch makes swsusp avoid triggering the BUG_ON() in swsusp_suspend()
if there is not enough memory for suspend.  Please apply.

Greetings,
Rafael


Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

Index: linux-2.6.14-rc2/kernel/power/swsusp.c
===================================================================
--- linux-2.6.14-rc2.orig/kernel/power/swsusp.c	2005-09-22 22:22:39.000000000 +0200
+++ linux-2.6.14-rc2/kernel/power/swsusp.c	2005-09-22 22:23:10.000000000 +0200
@@ -918,6 +918,7 @@
 
 	pagedir_nosave = NULL;
 	nr_copy_pages = calc_nr(nr_copy_pages);
+	nr_copy_pages_check = nr_copy_pages;
 
 	pr_debug("suspend: (pages needed: %d + %d free: %d)\n",
 		 nr_copy_pages, PAGES_FOR_IO, nr_free_pages());
@@ -940,7 +941,6 @@
 		return error;
 	}
 
-	nr_copy_pages_check = nr_copy_pages;
 	return 0;
 }
 

-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"

Re: [PATCH][Fix] swsusp: do not trigger BUG_ON() if there is not enough memory

[Pavel Machek]

Hi!

> The following patch makes swsusp avoid triggering the BUG_ON() in swsusp_suspend()
> if there is not enough memory for suspend.  Please apply.

Patch is okay. I had fix for same problem, but it was uglyer.

									Pavel

-- 
if you have sharp zaurus hardware you don't need... you know my address