diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-25 08:05:30 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-31 17:09:22 +0300 |
| commit | dca89ea9e03641d202971dccff411edec5252775 (patch) | |
| tree | 523d2057eb3d88105b898f5654e896afb08e6a93 /arch/sparc | |
| parent | a553c52f811798d5cccdd7867db5728c6dc00cf0 (diff) | |
| download | linux-dca89ea9e03641d202971dccff411edec5252775.tar.xz | |
sparc64: Fix hibernation code refrence to PAGE_OFFSET.
commit 9d0713edf72461438bc3526e4ea55fec47754cd9 upstream.
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')
| -rw-r--r-- | arch/sparc/power/hibernate_asm.S | 4 |
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 |