From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: [RFC][PATCH] PM / Hibernate: Modify signature used
	to mark swap
Date: Thu, 30 Sep 2010 00:02:03 +0200
Message-ID: <201009300002.03412.rjw@sisk.pl>
References: <201009292313.23601.rjw@sisk.pl> <4CA3ADED.6090908@tuxonice.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <linux-pm-bounces@lists.linux-foundation.org>
In-Reply-To: <4CA3ADED.6090908@tuxonice.net>
List-Unsubscribe: <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=unsubscribe>
List-Archive: <http://lists.linux-foundation.org/pipermail/linux-pm>
List-Post: <mailto:linux-pm@lists.linux-foundation.org>
List-Help: <mailto:linux-pm-request@lists.linux-foundation.org?subject=help>
List-Subscribe: <https://lists.linux-foundation.org/mailman/listinfo/linux-pm>,
	<mailto:linux-pm-request@lists.linux-foundation.org?subject=subscribe>
Sender: linux-pm-bounces@lists.linux-foundation.org
Errors-To: linux-pm-bounces@lists.linux-foundation.org
To: Nigel Cunningham <nigel@tuxonice.net>
Cc: Linux-pm mailing list <linux-pm@lists.linux-foundation.org>, LKML <linux-kernel@vger.kernel.org>
List-Id: linux-pm@vger.kernel.org

On Wednesday, September 29, 2010, Nigel Cunningham wrote:
> Hi.
> 
> On 30/09/10 07:13, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki<rjw@sisk.pl>
> > Subject: 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>
> > ---
> >   kernel/power/swap.c |    6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > Index: linux-2.6/kernel/power/swap.c
> > ===================================================================
> > --- linux-2.6.orig/kernel/power/swap.c
> > +++ linux-2.6/kernel/power/swap.c
> > @@ -29,7 +29,7 @@
> >
> >   #include "power.h"
> >
> > -#define SWSUSP_SIG	"S1SUSPEND"
> > +#define HIBERNATE_SIG	"LINHIB0001"
> >
> >   /*
> >    *	The swap map is a data structure used for keeping track of each page
> > @@ -195,7 +195,7 @@ static int mark_swapfiles(struct swap_ma
> >   	if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
> >   	    !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
> >   		memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
> 
> if no compression
> 
> > -		memcpy(swsusp_header->sig,SWSUSP_SIG, 10);
> 
> else
> 
> > +		memcpy(swsusp_header->sig, HIBERNATE_SIG, 10);
> 
> ??

I thought about that, but we'll need to drop the old signature when the image
format changes (I think it will after your patch series) anyway.  And the
benefit is not really worth it IMO (it only affects people using the in-kernel
hibernation on x86-64).

Thanks,
Rafael