diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-09 22:34:08 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:33 (GMT) |
| commit | 151b2e78dcb7543e7ee3e6fd7907abb60105d0f7 (patch) | |
| tree | 33412b4750b1b2e2d927d6848ba02a7aef77f108 /kernel | |
| parent | cb495faf34a150608f1c3c25fc79b99a7a18be15 (diff) | |
| download | linux-fsl-qoriq-151b2e78dcb7543e7ee3e6fd7907abb60105d0f7.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')
| -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 723962a..767b3b8 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6586,7 +6586,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) |