---

yaml --- r: 56919 b: refs/heads/master c: 98d8256 h: refs/heads/master i: 56917: a391c41 56915: 717fa67 56911: f60716b v: v3
git-mirror · May 24, 2007 · 6243437 · 6243437
1 parent 3e43cd3
commit 6243437
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40acc095302aee380491df5f58d98945243468ec
+refs/heads/master: 98d8256739f2c6c636fa2da359f5949c739ae839
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4775,9 +4775,7 @@ int __sched cond_resched_softirq(void)
 	BUG_ON(!in_softirq());
 
 	if (need_resched() && system_state == SYSTEM_RUNNING) {
-		raw_local_irq_disable();
-		_local_bh_enable();
-		raw_local_irq_enable();
+		local_bh_enable();
 		__cond_resched();
 		local_bh_disable();
 		return 1;