tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] swsusp: fix breakage with swap on LVM

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>

authored by

Rafael J. Wysocki and committed by
Linus Torvalds a8534adb ed3d021b

+1 -3
+1 -3
kernel/power/swsusp.c
··· 153 153 { 154 154 int i; 155 155 156 - if (!swsusp_resume_device) 157 - return -ENODEV; 158 156 spin_lock(&swap_lock); 159 157 for (i = 0; i < MAX_SWAPFILES; i++) { 160 158 if (!(swap_info[i].flags & SWP_WRITEOK)) 161 159 continue; 162 - if (is_resume_device(swap_info + i)) { 160 + if (!swsusp_resume_device || is_resume_device(swap_info + i)) { 163 161 spin_unlock(&swap_lock); 164 162 root_swap = i; 165 163 return 0;