]> err.no Git - linux-2.6/commit
[PATCH] swsusp: Do not fail if resume device is not set
authorRafael J. Wysocki <rjw@sisk.pl>
Sat, 6 Jan 2007 00:36:28 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 6 Jan 2007 07:55:22 +0000 (23:55 -0800)
commit7bf236874292fd073c6bdd27f89c3d9e81a79cbc
tree27e4196e4b720c113010d544567f76f181c11428
parent3223ea8cca5936b8e78450dd5b8ba88372e9c0a8
[PATCH] swsusp: Do not fail if resume device is not set

In the kernels later than 2.6.19 there is a regression that makes swsusp
fail if the resume device is not explicitly specified.

It can be fixed by adding an additional parameter to
mm/swapfile.c:swap_type_of() allowing us to pass the (struct block_device
*) corresponding to the first available swap back to the caller.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/swap.h
kernel/power/swap.c
kernel/power/user.c
mm/swapfile.c