Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq cleanups from Ingo Molnar: "This is a multi-arch cleanup series from Thomas Gleixner, which we kept to near the end of the merge window, to not interfere with architecture updates. This series (motivated by the -rt kernel) unifies more aspects of IRQ handling and generalizes PREEMPT_ACTIVE" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: preempt: Make PREEMPT_ACTIVE generic sparc: Use preempt_schedule_irq ia64: Use preempt_schedule_irq m32r: Use preempt_schedule_irq hardirq: Make hardirq bits generic m68k: Simplify low level interrupt handling code genirq: Prevent spurious detection for unconditionally polled interrupts
This commit is contained in:
@@ -312,12 +312,10 @@ to_kernel:
|
||||
nop
|
||||
cmp %l4, 0
|
||||
bne,pn %xcc, kern_fpucheck
|
||||
sethi %hi(PREEMPT_ACTIVE), %l6
|
||||
stw %l6, [%g6 + TI_PRE_COUNT]
|
||||
call schedule
|
||||
nop
|
||||
call preempt_schedule_irq
|
||||
nop
|
||||
ba,pt %xcc, rtrap
|
||||
stw %g0, [%g6 + TI_PRE_COUNT]
|
||||
#endif
|
||||
kern_fpucheck: ldub [%g6 + TI_FPDEPTH], %l5
|
||||
brz,pt %l5, rt_continue
|
||||
|
Reference in New Issue
Block a user