diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-09 22:34:08 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:06 (GMT) |
| commit | a6adc869b7baf84e394d0894095a26f261e1aad2 (patch) | |
| tree | 9fad4b7d1c9783405be28b23cf0cc8deb3cbe2d8 /kernel/sched | |
| parent | 79f8b5f5f36df26500c04cb7749ba41c839b054e (diff) | |
| download | linux-fsl-qoriq-a6adc869b7baf84e394d0894095a26f261e1aad2.tar.xz | |
sched: Check for idle task in might_sleep()
Idle is not allowed to call sleeping functions ever!
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/sched')
| -rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index ce7631d..aad8e9c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6585,7 +6585,8 @@ void __might_sleep(const char *file, int line, int preempt_offset) static unsigned long prev_jiffy; /* ratelimiting */ rcu_sleep_check(); /* WARN_ON_ONCE() by default, no rate limit reqd. */ - if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) || + if ((preempt_count_equals(preempt_offset) && !irqs_disabled() && + !is_idle_task(current)) || system_state != SYSTEM_RUNNING || oops_in_progress) return; if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) |