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;