From 6c6e1ac322662bcc2b3810ec6c05af3f398d41af Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 23 Feb 2010 18:52:51 +0100
Subject: [PATCH] sched: Fix in_softirq() changes fallout

commit 534714781c652a7113b6c90479a781a6b510279e in tip.

WARNING: at kernel/sched.c:7158 cond_resched_softirq_context+0x37/0x86()
triggers now. Shut it up.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/kernel/sched.c b/kernel/sched.c
index 2c3d872..2119115 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -7142,7 +7142,7 @@ EXPORT_SYMBOL(__cond_resched_softirq);
  */
 int __sched cond_resched_softirq_context(void)
 {
-	WARN_ON_ONCE(!in_softirq());
+	WARN_ON_ONCE(!in_softirq() && !(current->extra_flags & PFE_SOFTIRQ));
 
 	if (softirq_need_resched() && system_state == SYSTEM_RUNNING) {
 		raw_local_irq_disable();
-- 
1.7.1.1