[PATCH] swsusp: two simplifications
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:
committed by
Linus Torvalds
parent
2e32a43efd
commit
0245b3e787
@@ -562,7 +562,7 @@ int enough_swap(unsigned nr_pages)
|
||||
int swsusp_write(void)
|
||||
{
|
||||
int error;
|
||||
device_resume();
|
||||
|
||||
lock_swapdevices();
|
||||
error = write_suspend_image();
|
||||
/* This will unlock ignored swap devices since writing is finished */
|
||||
|
Reference in New Issue
Block a user