From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 24 Sep 2008 04:01:09 +0000 (+0000)
Subject: powerpc: Fix 64-bit hibernation with 64k pages
X-Git-Tag: v2.6.28-rc1~569^2~40
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30;p=linux-2.6-omap-h63xx.git

powerpc: Fix 64-bit hibernation with 64k pages

A bug in my initial 64-bit hibernation code breaks it when using
page sizes that aren't 4K.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/kernel/swsusp_asm64.S b/arch/powerpc/kernel/swsusp_asm64.S
index e092c3cbdb9..86ac1d90d02 100644
--- a/arch/powerpc/kernel/swsusp_asm64.S
+++ b/arch/powerpc/kernel/swsusp_asm64.S
@@ -133,7 +133,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 
 	cmpdi	r12,0
 	beq-	nothing_to_copy
-	li	r15,512
+	li	r15,PAGE_SIZE>>3
 copyloop:
 	ld	r13,pbe_address(r12)
 	ld	r14,pbe_orig_address(r12)