aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-01-09 23:34:08 +0100
committerSteven Rostedt <rostedt@goodmis.org>2013-08-13 16:09:05 -0400
commitd16ba57a0ae0aa7f7d3532c194c3bdd019e7672e (patch)
tree1cd0356d97497a74aaac66b51e9961ae2936f515
parent02140307239f2593594044421488b8f746649cc9 (diff)
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>
-rw-r--r--kernel/sched/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index acb69dcb6d10..1478d3b01fb1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7395,7 +7395,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)