diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2005-10-30 15:00:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 17:37:15 -0800 |
| commit | 0245b3e787dc3267a915e1f56419e7e9c197e148 (patch) | |
| tree | 96a366f2fc732f42d4993dd177982e6b657d83aa /kernel/power/swsusp.c | |
| parent | 2e32a43efdc8175579cc91e8b620ac331376a437 (diff) | |
[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>
Diffstat (limited to 'kernel/power/swsusp.c')
| -rw-r--r-- | kernel/power/swsusp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c index ae8425b69b4..12db1d2ad61 100644 --- a/kernel/power/swsusp.c +++ b/kernel/power/swsusp.c @@ -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 */ |