diff options
author | David S. Miller <davem@davemloft.net> | 2014-09-25 00:05:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-26 22:50:31 -0400 |
commit | 9d0713edf72461438bc3526e4ea55fec47754cd9 (patch) | |
tree | 9c4c00a000e192a99751f7cefa294e76158e31c0 /arch/sparc | |
parent | c21c4ab0d6921f7160a43216fa6973b5924de561 (diff) |
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')
-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) | |||
54 | nop | 54 | nop |
55 | 55 | ||
56 | /* Write PAGE_OFFSET to %g7 */ | 56 | /* Write PAGE_OFFSET to %g7 */ |
57 | sethi %uhi(PAGE_OFFSET), %g7 | 57 | sethi %hi(PAGE_OFFSET), %g7 |
58 | sllx %g7, 32, %g7 | 58 | ldx [%g7 + %lo(PAGE_OFFSET)], %g7 |
59 | 59 | ||
60 | setuw (PAGE_SIZE-8), %g3 | 60 | setuw (PAGE_SIZE-8), %g3 |
61 | 61 | ||