powerpc: Fix 64-bit hibernation with 64k pages
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 24 Sep 2008 04:01:09 +0000 (04:01 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 7 Oct 2008 03:26:20 +0000 (14:26 +1100)
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>
arch/powerpc/kernel/swsusp_asm64.S

index e092c3cbdb9b978ac3f7a9123375e07769e0aab5..86ac1d90d02bcb3d80060d7531da58022f685987 100644 (file)
@@ -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)