lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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:
Rafael J. Wysocki
2005-09-22 21:44:01 -07:00
committed by Linus Torvalds
parent 4c87b74c72
commit 57487f4376
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/power/swsusp.c
View File

@@ -918,6 +918,7 @@ static int swsusp_alloc(void)
pagedir_nosave = NULL; pagedir_nosave = NULL;
nr_copy_pages = calc_nr(nr_copy_pages); 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", pr_debug("suspend: (pages needed: %d + %d free: %d)\n",
nr_copy_pages, PAGES_FOR_IO, nr_free_pages()); nr_copy_pages, PAGES_FOR_IO, nr_free_pages());
@@ -940,7 +941,6 @@ static int swsusp_alloc(void)
return error; return error;
} }
nr_copy_pages_check = nr_copy_pages;
return 0; return 0;
} }