summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2004-12-12 16:32:14 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-12 16:32:14 -0800
commit93df896661acc32b14c617bb875dc9ad4de972dd (patch)
tree02af10f0d9fdf6c9800633279d1bdb44667e715f /kernel
parent7032d83e7263863e188033170f53cd5c9befc066 (diff)
[PATCH] swsusp bugfixes: fix memory leak
This fixes memory leak when we are low on memory during suspend. Ouch and nr_needed_pages is only used twice, and only written :-(. I guess that can wait for 2.6.10. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/swsusp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index d9c7504f158f..f6d25005bddb 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -786,12 +786,13 @@ static int swsusp_alloc(void)
int suspend_prepare_image(void)
{
- unsigned int nr_needed_pages = 0;
+ unsigned int nr_needed_pages;
int error;
pr_debug("swsusp: critical section: \n");
if (save_highmem()) {
printk(KERN_CRIT "Suspend machine: Not enough free pages for highmem\n");
+ restore_highmem();
return -ENOMEM;
}