Merge tag 'md/3.18' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / arch / sparc / power / hibernate_asm.S

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