Skip to content

Commit

Permalink
PM / Hibernate: Restore old swap signature to avoid user space breakage
Browse files Browse the repository at this point in the history
Commit 3624eb0 (PM / Hibernate: Modify signature used to mark swap)
attempted to modify hibernate signature used to mark swap partitions
containing hibernation images, so that old kernels don't try to
handle compressed images.  However, this change broke resume from
hibernation on Fedora 14 that apparently doesn't pass the resume=
argument to the kernel and tries to trigger resume from early user
space.  This doesn't work, because the signature is now different,
so the old signature has to be restored to avoid the problem.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22732 .

Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
Reported-by: Zhang Rui <rui.zhang@intel.com>
Reported-by: Pascal Chapperon <pascal.chapperon@wanadoo.fr>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
  • Loading branch information
Rafael J. Wysocki committed Dec 16, 2010
1 parent 1497dd1 commit be8cd64
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/power/swap.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "power.h"

#define HIBERNATE_SIG "LINHIB0001"
#define HIBERNATE_SIG "S1SUSPEND"

/*
* The swap map is a data structure used for keeping track of each page
Expand Down

0 comments on commit be8cd64

Please sign in to comment.