summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-09-24 06:01:09 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-07 05:26:20 +0200
commit2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30 (patch)
tree7d56839331a5f9aceeccabbe114ebcf6d6891a01
parentpowerpc/iseries: Remove unused variable in viodasd.c (diff)
downloadlinux-2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30.tar.xz
linux-2e2b4043cc0a2c11abbe4fdff6dce3f81cff3e30.zip
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>
-rw-r--r--arch/powerpc/kernel/swsusp_asm64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/swsusp_asm64.S b/arch/powerpc/kernel/swsusp_asm64.S
index e092c3cbdb9b..86ac1d90d02b 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)