Skip to content

L
linux
Commit 306eb7e6 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SPARC64]: Fix interrupt enabling on trap return.

parent 6dde2ed0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
arch/sparc64/kernel/rtrap.S
View file @ 306eb7e6
...@@ -185,6 +185,7 @@ rtrap_xcall: ...@@ -185,6 +185,7 @@ rtrap_xcall:
* sched+signal checks with IRQs disabled. * sched+signal checks with IRQs disabled.
*/ */
to_user: wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate to_user: wrpr %g0, RTRAP_PSTATE_IRQOFF, %pstate
wrpr 0, %pil
__handle_preemption_continue: __handle_preemption_continue:
ldx [%g6 + TI_FLAGS], %l0 ldx [%g6 + TI_FLAGS], %l0
sethi %hi(_TIF_USER_WORK_MASK), %o0 sethi %hi(_TIF_USER_WORK_MASK), %o0
...@@ -271,6 +272,7 @@ to_kernel: ...@@ -271,6 +272,7 @@ to_kernel:
brnz %l5, kern_fpucheck brnz %l5, kern_fpucheck
sethi %hi(PREEMPT_ACTIVE), %l6 sethi %hi(PREEMPT_ACTIVE), %l6
stw %l6, [%g6 + TI_PRE_COUNT] stw %l6, [%g6 + TI_PRE_COUNT]
wrpr 0, %pil
call schedule call schedule
nop nop
ba,pt %xcc, rtrap ba,pt %xcc, rtrap
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7