summaryrefslogtreecommitdiffstats
path: root/arch/m32r/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-09-17 18:53:07 +0000
committerThomas Gleixner <tglx@linutronix.de>2013-11-13 20:21:46 +0100
commit650e4dc2a75959fdca1eecc0147bbb21dbfadf0f (patch)
treec2fa75aef2803355631419aed950b85821ae08c7 /arch/m32r/kernel
parent54197e43a4a9a0f3fc406d72d9815754e84fab1e (diff)
downloadlinux-stable-650e4dc2a75959fdca1eecc0147bbb21dbfadf0f.tar.gz
linux-stable-650e4dc2a75959fdca1eecc0147bbb21dbfadf0f.tar.bz2
linux-stable-650e4dc2a75959fdca1eecc0147bbb21dbfadf0f.zip
m32r: Use preempt_schedule_irq
Use the proper core function instead of fiddling with preempt_active and interrupt enable in the low level code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Hirokazu Takata <takata@linux-m32r.org> Cc: linux-m32r-ja@ml.linux-m32r.org Link: http://lkml.kernel.org/r/20130917183628.758421136@linutronix.de
Diffstat (limited to 'arch/m32r/kernel')
-rw-r--r--arch/m32r/kernel/entry.S8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 0c01543f10cd..7c3db9940ce1 100644
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
@@ -182,13 +182,7 @@ need_resched:
ld r4, PSW(sp) ; interrupts off (exception path) ?
and3 r4, r4, #0x4000
beqz r4, restore_all
- LDIMM (r4, PREEMPT_ACTIVE)
- st r4, @(TI_PRE_COUNT, r8)
- ENABLE_INTERRUPTS(r4)
- bl schedule
- ldi r4, #0
- st r4, @(TI_PRE_COUNT, r8)
- DISABLE_INTERRUPTS(r4)
+ bl preempt_schedule_irq
bra need_resched
#endif