From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 7 Feb 2005 02:54:29 +0000 (+0000)
Subject: Use preempt_schedule_irq.
X-Git-Tag: v2.6.15-rc1~731^2~1^2~312
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18815abcdfd9f10a6ce6fbec3ad1af1ae101ce7;p=linux-2.6

Use preempt_schedule_irq.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index be0354a14e..ebc1a5d4f8 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)