[PATCH] swsusp: do not trigger BUG_ON() if there is not enough memory
The following patch makes swsusp avoid triggering the BUG_ON() in swsusp_suspend() if there is not enough memory for suspend. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
4c87b74c72
commit
57487f4376
|
@ -918,6 +918,7 @@ static int swsusp_alloc(void)
|
|||
|
||||
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 @@ static int swsusp_alloc(void)
|
|||
return error;
|
||||
}
|
||||
|
||||
nr_copy_pages_check = nr_copy_pages;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue