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

[PATCH] swsusp: rework swsusp_suspend

Browse Source 
This patch makes only the functions in swsusp.c call functions in snapshot.c
and not both ways.  It also moves the check for available swap out of
swsusp_suspend() which is necessary for separating the swap-handling functions
in swsusp from the core code.

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-11-08 21:34:41 -08:00
committed by Linus Torvalds
parent ed14b52701
commit 0fbeb5a45d
3 changed files with 47 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/power/snapshot.c
View File

@ -88,8 +88,7 @@ static int save_highmem_zone(struct zone *zone)
return 0;
}
static int save_highmem(void)
int save_highmem(void)
{
struct zone *zone;
int res = 0;
@ -120,11 +119,7 @@ int restore_highmem(void)
}
return 0;
}
#else
static int save_highmem(void) { return 0; }
int restore_highmem(void) { return 0; }
#endif /* CONFIG_HIGHMEM */
#endif
static int pfn_is_nosave(unsigned long pfn)
{
@ -416,11 +411,6 @@ asmlinkage int swsusp_save(void)
unsigned int nr_pages;
pr_debug("swsusp: critical section: \n");
if (save_highmem()) {
printk(KERN_CRIT "swsusp: Not enough free pages for highmem\n");
restore_highmem();
return -ENOMEM;
}
drain_local_pages();
nr_pages = count_data_pages();
@ -440,11 +430,6 @@ asmlinkage int swsusp_save(void)
return -ENOMEM;
}
if (!enough_swap(nr_pages)) {
printk(KERN_ERR "swsusp: Not enough free swap\n");
return -ENOSPC;
}
pagedir_nosave = swsusp_alloc(nr_pages);
if (!pagedir_nosave)
return -ENOMEM;