projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c21c4ab)
sparc64: Fix hibernation code refrence to PAGE_OFFSET.
authorDavid S. Miller <davem@davemloft.net>
Thu, 25 Sep 2014 04:05:30 +0000 (21:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 27 Sep 2014 02:50:31 +0000 (19:50 -0700)
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>
arch/sparc/power/hibernate_asm.S patch | blob | blame | history

diff --git a/arch/sparc/power/hibernate_asm.S b/arch/sparc/power/hibernate_asm.S
index 79942166df841eeef137d25f9c8330ff7b27e7ac..d7d9017dcb15b23b8c98b4de8e14f1cc62749e34 100644 (file)
--- 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