leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frv: fix the broken preempt

Browse Source 
Just get %icc2 into the state we would have after local_irq_disable()
and physical IRQ having happened since then.  Then we can simply
use preempt_schedule_irq() and be done with the whole mess.

Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-11-02 12:05:44 -04:00
parent 7b7ade1179
commit 1d72d9f83d
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/frv/kernel/entry.S
View File

@ -1075,27 +1075,10 @@ __entry_return_from_kernel_interrupt:
subicc gr5,#0,gr0,icc0 subicc gr5,#0,gr0,icc0
beq icc0,#0,__entry_return_direct beq icc0,#0,__entry_return_direct
__entry_preempt_need_resched: subcc gr0,gr0,gr0,icc2 /* set Z and clear C */
ldi @(gr15,#TI_FLAGS),gr4 call preempt_schedule_irq
andicc gr4,#_TIF_NEED_RESCHED,gr0,icc0
beq icc0,#1,__entry_return_direct
setlos #PREEMPT_ACTIVE,gr5
sti gr5,@(gr15,#TI_PRE_COUNT)
andi gr23,#~PSR_PIL,gr23
movgs gr23,psr
call schedule
sti gr0,@(gr15,#TI_PRE_COUNT)
movsg psr,gr23
ori gr23,#PSR_PIL_14,gr23
movgs gr23,psr
bra __entry_preempt_need_resched
#else
bra __entry_return_direct
#endif #endif
bra __entry_return_direct
############################################################################### ###############################################################################