From 2a5e5013141e75b6b2c90a6fff35b6ccb8c9ccbe Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 4 Mar 2005 12:35:42 +0000
Subject: [PATCH] --- yaml --- r: 11036 b: refs/heads/master c:
 cdaed73afb61913ee5115aa38b0c35ecb0513f50 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/kernel/entry.S | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d55181718b22..b3ea4a21f2a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebc7f12fbc6a2d2df1930b91b380c9defb48cbf3
+refs/heads/master: cdaed73afb61913ee5115aa38b0c35ecb0513f50
diff --git a/trunk/arch/mips/kernel/entry.S b/trunk/arch/mips/kernel/entry.S
index ebc1a5d4f8b8..6e01b0dd031f 100644
--- a/trunk/arch/mips/kernel/entry.S
+++ b/trunk/arch/mips/kernel/entry.S
@@ -58,9 +58,8 @@ need_resched:
 	LONG_L	t0, PT_STATUS(sp)		# Interrupts off?
 	andi	t0, 1
 	beqz	t0, restore_all
-	li	t0, PREEMPT_ACTIVE
-	sw	t0, TI_PRE_COUNT($28)
 	jal	preempt_schedule_irq
+	b	need_resched
 #endif
 
 FEXPORT(ret_from_fork)