OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c21c4ab
)
sparc64: Fix hibernation code refrence to PAGE_OFFSET.
author
David S. Miller
<davem@davemloft.net>
Thu, 25 Sep 2014 04:05:30 +0000
(21:05 -0700)
committer
David 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
|
history
diff --git
a/arch/sparc/power/hibernate_asm.S
b/arch/sparc/power/hibernate_asm.S
index
7994216
..
d7d9017
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 %
u
hi(PAGE_OFFSET), %g7
-
sllx %g7, 32
, %g7
+ sethi %hi(PAGE_OFFSET), %g7
+
ldx [%g7 + %lo(PAGE_OFFSET)]
, %g7
setuw (PAGE_SIZE-8), %g3