From 6243437f6cd07d72888665333df615387df6cb82 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 23 May 2007 13:58:18 -0700
Subject: [PATCH] --- yaml --- r: 56919 b: refs/heads/master c:
 98d8256739f2c6c636fa2da359f5949c739ae839 h: refs/heads/master i:   56917:
 a391c41038e9eafd620300ba83ebb332f4241b5b   56915:
 717fa678ecd0ed6e75f8a1db06eacc59eef62781   56911:
 f60716bfc2f99a79d43b5323ae503a8bc7be0955 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3541a58ee526..8815e42fbb4f 100644
--- 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
index 799d23b4e35d..13cdab3b4c48 100644
--- 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;