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

[PATCH] swsusp: two simplifications

Browse Source 
The following patch simplifies the progress meter in disk.c:free_some_memory()
and makes disk.c:pm_suspend_disk() call device_resume() explicitly in the
suspend path.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.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-10-30 15:00:01 -08:00
committed by Linus Torvalds
parent 2e32a43efd
commit 0245b3e787
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/power/disk.c
View File

@@ -92,10 +92,7 @@ static void free_some_memory(void)
printk("Freeing memory... "); printk("Freeing memory... ");
while ((tmp = shrink_all_memory(10000))) { while ((tmp = shrink_all_memory(10000))) {
pages += tmp; pages += tmp;
printk("\b%c", p[i]); printk("\b%c", p[i++ % 4]);
i++;
if (i > 3)
i = 0;
} }
printk("\bdone (%li pages freed)\n", pages); printk("\bdone (%li pages freed)\n", pages);
} }
@@ -177,13 +174,12 @@ int pm_suspend_disk(void)
goto Done; goto Done;
if (in_suspend) { if (in_suspend) {
device_resume();
pr_debug("PM: writing image.\n"); pr_debug("PM: writing image.\n");
error = swsusp_write(); error = swsusp_write();
if (!error) if (!error)
power_down(pm_disk_mode); power_down(pm_disk_mode);
else { else {
/* swsusp_write can not fail in device_resume,
no need to do second device_resume */
swsusp_free(); swsusp_free();
unprepare_processes(); unprepare_processes();
return error; return error;

2
kernel/power/swsusp.c
View File

@@ -562,7 +562,7 @@ int enough_swap(unsigned nr_pages)
int swsusp_write(void) int swsusp_write(void)
{ {
int error; int error;
device_resume();
lock_swapdevices(); lock_swapdevices();
error = write_suspend_image(); error = write_suspend_image();
/* This will unlock ignored swap devices since writing is finished */ /* This will unlock ignored swap devices since writing is finished */