From: Johannes Berg <johannes@sipsolutions.net>
To: linuxppc-dev list <linuxppc-dev@ozlabs.org>
Subject: [PATCH] powerpc: fix 64-bit hibernation with 64k pages
Date: Wed, 24 Sep 2008 16:01:09 +0200 [thread overview]
Message-ID: <1222264869.4257.13.camel@johannes.berg> (raw)
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(-)
--- 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
reply other threads:[~2008-09-24 14:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1222264869.4257.13.camel@johannes.berg \
--to=johannes@sipsolutions.net \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox