summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/entry.S
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2005-02-07 03:54:29 +0100
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 20:30:27 +0200
commita18815abcdfd9f10a6ce6fbec3ad1af1ae101ce7 (patch)
tree9be4382c2fefbcde7f47335c77d80a24a65f29e0 /arch/mips/kernel/entry.S
parentMore oprofile bits for MIPS32-style performance counters. The code to (diff)
downloadlinux-a18815abcdfd9f10a6ce6fbec3ad1af1ae101ce7.tar.xz
linux-a18815abcdfd9f10a6ce6fbec3ad1af1ae101ce7.zip
Use preempt_schedule_irq.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/entry.S')
-rw-r--r--arch/mips/kernel/entry.S7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index be0354a14e26..ebc1a5d4f8b8 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -48,6 +48,7 @@ resume_userspace:
#ifdef CONFIG_PREEMPT
resume_kernel:
+ local_irq_disable
lw t0, TI_PRE_COUNT($28)
bnez t0, restore_all
need_resched:
@@ -59,11 +60,7 @@ need_resched:
beqz t0, restore_all
li t0, PREEMPT_ACTIVE
sw t0, TI_PRE_COUNT($28)
- local_irq_enable
- jal schedule
- sw zero, TI_PRE_COUNT($28)
- local_irq_disable
- b need_resched
+ jal preempt_schedule_irq
#endif
FEXPORT(ret_from_fork)