From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Andrew Morton <akpm@osdl.org>
Subject: Re: [patch] 2.6.11-rc3-mm1: fix swsusp with gcc 3.4
Date: Fri, 4 Feb 2005 22:51:53 +0100
User-Agent: KMail/1.7.1
Cc: Adrian Bunk <bunk@stusta.de>, Pavel Machek <pavel@suse.cz>,
       linux-kernel@vger.kernel.org
References: <20050204103350.241a907a.akpm@osdl.org> <20050204201135.GD19408@stusta.de>
In-Reply-To: <20050204201135.GD19408@stusta.de>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-2"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200502042251.54316.rjw@sisk.pl>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1250
Lines: 45

On Friday, 4 of February 2005 21:11, Adrian Bunk wrote:
> On Fri, Feb 04, 2005 at 10:33:50AM -0800, Andrew Morton wrote:
> >...
> > Changes since 2.6.11-rc2-mm2:
> >...
> > +swsusp-do-not-use-higher-order-memory-allocations-on-suspend.patch
> > 
> >  swsusp fix
> >...
> 
> This broke compilation with gcc 3.4:
[-- snip --]

BTW, it requires the following bugfix, on top of the Adrian's patch.

Greets,
Rafael

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

--- linux-2.6.11-rc3-mm1/kernel/power/swsusp.c	2005-02-04 22:33:52.000000000 +0100
+++ new/kernel/power/swsusp.c	2005-02-04 22:32:36.000000000 +0100
@@ -614,9 +614,9 @@
 	struct pbe *pbe;
 
 	while (pblist) {
-		pbe = pblist + PB_PAGE_SKIP;
-		pblist = pbe->next;
+		pbe = (pblist + PB_PAGE_SKIP)->next;
 		free_page((unsigned long)pblist);
+		pblist = pbe;
 	}
 }
 

-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/