summaryrefslogtreecommitdiff
path: root/arch/sparc/power
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-24 21:05:30 -0700
committerDavid S. Miller <davem@davemloft.net>2014-09-26 19:50:31 -0700
commit9d0713edf72461438bc3526e4ea55fec47754cd9 (patch)
tree9c4c00a000e192a99751f7cefa294e76158e31c0 /arch/sparc/power
parentc21c4ab0d6921f7160a43216fa6973b5924de561 (diff)
downloadlinux-9d0713edf72461438bc3526e4ea55fec47754cd9.tar.gz
sparc64: Fix hibernation code refrence to PAGE_OFFSET.
We changed PAGE_OFFSET to be a variable rather than a constant, but this reference here in the hibernate assembler got missed. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/power')
-rw-r--r--arch/sparc/power/hibernate_asm.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/power/hibernate_asm.S b/arch/sparc/power/hibernate_asm.S
index 79942166df84..d7d9017dcb15 100644
--- a/arch/sparc/power/hibernate_asm.S
+++ b/arch/sparc/power/hibernate_asm.S
@@ -54,8 +54,8 @@ ENTRY(swsusp_arch_resume)
nop
/* Write PAGE_OFFSET to %g7 */
- sethi %uhi(PAGE_OFFSET), %g7
- sllx %g7, 32, %g7
+ sethi %hi(PAGE_OFFSET), %g7
+ ldx [%g7 + %lo(PAGE_OFFSET)], %g7
setuw (PAGE_SIZE-8), %g3