---

yaml --- r: 10982 b: refs/heads/master c: a18815a h: refs/heads/master v: v3
git-mirror · Oct 29, 2005 · 74a929d · 74a929d
1 parent 9fcca5a
commit 74a929d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54176736f734ca3a1f27416d8e5804981a627076
+refs/heads/master: a18815abcdfd9f10a6ce6fbec3ad1af1ae101ce7
diff --git a/trunk/arch/mips/kernel/entry.S b/trunk/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)