Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
PM / Hibernate: Modify signature used to mark swap
Since we are adding compression to the kernel's hibernate code,
change signature used by it to mark swap spaces, so that earlier
kernels don't attempt to restore compressed images they cannot
handle.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
+3
-3
kernel/power/swap.c
+3
-3
kernel/power/swap.c
···
29
30
#include "power.h"
31
32
-
#define SWSUSP_SIG "S1SUSPEND"
33
34
/*
35
* The swap map is a data structure used for keeping track of each page
···
195
if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
196
!memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
197
memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
198
-
memcpy(swsusp_header->sig,SWSUSP_SIG, 10);
199
swsusp_header->image = handle->first_sector;
200
swsusp_header->flags = flags;
201
error = hib_bio_write_page(swsusp_resume_block,
···
916
if (error)
917
goto put;
918
919
-
if (!memcmp(SWSUSP_SIG, swsusp_header->sig, 10)) {
920
memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
921
/* Reset swap signature now */
922
error = hib_bio_write_page(swsusp_resume_block,
···
29
30
#include "power.h"
31
32
+
#define HIBERNATE_SIG "LINHIB0001"
33
34
/*
35
* The swap map is a data structure used for keeping track of each page
···
195
if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
196
!memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
197
memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
198
+
memcpy(swsusp_header->sig, HIBERNATE_SIG, 10);
199
swsusp_header->image = handle->first_sector;
200
swsusp_header->flags = flags;
201
error = hib_bio_write_page(swsusp_resume_block,
···
916
if (error)
917
goto put;
918
919
+
if (!memcmp(HIBERNATE_SIG, swsusp_header->sig, 10)) {
920
memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
921
/* Reset swap signature now */
922
error = hib_bio_write_page(swsusp_resume_block,