X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fsched.c;h=13cdab3b4c4805712cd1039588d0938b54c8822f;hb=5212c555be332fc95982077e6cdc7bb6cb5fff5f;hp=799d23b4e35dacf56e118d82953102db54c0fdfb;hpb=2c4f365ad2361c93c097e958b2b0a7a112750228;p=~andy%2Flinux

diff --git a/kernel/sched.c b/kernel/sched.c
index 799d23b4e35..13cdab3b4c4 100644
--- a/kernel/sched.c
+++ b/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;