diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-23 18:52:51 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-24 00:31:32 +0100 |
| commit | 534714781c652a7113b6c90479a781a6b510279e (patch) | |
| tree | 2d40b5c93824a3d206fbef0e1654a122a607e9a6 | |
| parent | 4e99db3861388e6bb49a84cf6aa599cbe1e4804d (diff) | |
| download | lwn-534714781c652a7113b6c90479a781a6b510279e.tar.gz lwn-534714781c652a7113b6c90479a781a6b510279e.zip | |
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 <tglx@linutronix.de>
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |