malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] swsusp: fix breakage with swap on LVM

Browse Source 
Restore the compatibility with the older code and make it possible to
suspend if the kernel command line doesn't contain the "resume=" argument

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 2006-02-17 13:52:51 -08:00 committed by Linus Torvalds
parent ed3d021b82
commit a8534adb74
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/power/swsusp.c
View File

@ -153,13 +153,11 @@ static int swsusp_swap_check(void) /* This is called before saving image */
{ {
int i; int i;
if (!swsusp_resume_device)
return -ENODEV;
spin_lock(&swap_lock); spin_lock(&swap_lock);
for (i = 0; i < MAX_SWAPFILES; i++) { for (i = 0; i < MAX_SWAPFILES; i++) {
if (!(swap_info[i].flags & SWP_WRITEOK)) if (!(swap_info[i].flags & SWP_WRITEOK))
continue; continue;
if (is_resume_device(swap_info + i)) { if (!swsusp_resume_device || is_resume_device(swap_info + i)) {
spin_unlock(&swap_lock); spin_unlock(&swap_lock);
root_swap = i; root_swap = i;
return 0; return 0;