From 534714781c652a7113b6c90479a781a6b510279e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 23 Feb 2010 18:52:51 +0100 Subject: sched: Fix in_softirq() changes fallout WARNING: at kernel/sched.c:7158 cond_resched_softirq_context+0x37/0x86() triggers now. Shut it up. Signed-off-by: Thomas Gleixner --- kernel/sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched.c b/kernel/sched.c index 32d7eb474fa7..aaa99187cd09 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7155,7 +7155,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(); -- cgit v1.2.3