Patchwork powerpc: fix 64-bit hibernation with 64k pages

login
register
mail settings
Submitter Johannes Berg
Date Sept. 24, 2008, 2:01 p.m.
Message ID <1222264869.4257.13.camel@johannes.berg>
Download mbox | patch
Permalink /patch/1287/
State Accepted
Headers show

Comments

Johannes Berg - Sept. 24, 2008, 2:01 p.m.
Brown paper bag patch, the fact that it didn't work is entirely my fault
for hardcoding 512 in the original patch.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
Contains the revert for the earlier patch just in case; probably better
to not apply the earlier patch and only the first hunk of this.

---
 arch/powerpc/Kconfig               |    2 +-
 arch/powerpc/kernel/swsusp_asm64.S |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

--- wireless-testing.orig/arch/powerpc/kernel/swsusp_asm64.S	2008-09-24 15:32:07.119071976 +0200
+++ wireless-testing/arch/powerpc/kernel/swsusp_asm64.S	2008-09-24 15:32:15.723824535 +0200
@@ -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)
--- wireless-testing.orig/arch/powerpc/Kconfig	2008-09-24 15:32:36.483825650 +0200
+++ wireless-testing/arch/powerpc/Kconfig	2008-09-24 15:32:42.837826811 +0200
@@ -194,7 +194,7 @@  config HIBERNATE_32
 
 config HIBERNATE_64
 	bool
-	depends on BROKEN || (PPC_PMAC64 && !PPC_64K_PAGES && EXPERIMENTAL)
+	depends on BROKEN || (PPC_PMAC64 && EXPERIMENTAL)
 	default y
 
 config ARCH_HIBERNATION_POSSIBLE