projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f7ee7c
)
[SPARC64]: Kill hard-coded %pstate setting in sparc_exit.
author
David S. Miller
<davem@davemloft.net>
Wed, 1 Feb 2006 02:34:06 +0000
(18:34 -0800)
committer
David S. Miller
<davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:11:26 +0000
(
01:11
-0800)
Just flip the bit off of whatever it's currently set to.
PSTATE_IE is guarenteed to be enabled when we get here.
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/entry.S
patch
|
blob
|
history
diff --git
a/arch/sparc64/kernel/entry.S
b/arch/sparc64/kernel/entry.S
index
ad919f4
..
563fa4e
100644
(file)
--- a/
arch/sparc64/kernel/entry.S
+++ b/
arch/sparc64/kernel/entry.S
@@
-1475,13
+1475,14
@@
ret_from_syscall:
1: b,pt %xcc, ret_sys_call
ldx [%sp + PTREGS_OFF + PT_V9_I0], %o0
-sparc_exit: wrpr %g0, (PSTATE_RMO | PSTATE_PEF | PSTATE_PRIV), %pstate
+sparc_exit: rdpr %pstate, %g2
+ wrpr %g2, PSTATE_IE, %pstate
rdpr %otherwin, %g1
rdpr %cansave, %g3
add %g3, %g1, %g3
wrpr %g3, 0x0, %cansave
wrpr %g0, 0x0, %otherwin
- wrpr %g
0, (PSTATE_RMO | PSTATE_PEF | PSTATE_PRIV | PSTATE_IE)
, %pstate
+ wrpr %g
2, 0x0
, %pstate
ba,pt %xcc, sys_exit
stb %g0, [%g6 + TI_WSAVED]