aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-01-09 23:34:08 +0100
committerSteven Rostedt <rostedt@rostedt.homelinux.com>2013-06-06 21:28:29 -0400
commit8731aa72759ea34085f4ea1b7f3e8d83f7350433 (patch)
tree74eabb1d8290c1af31438146ff73c18c2abfd260
parent36647604add9607c73032b477982307fde4f39ea (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 86256279c620..8307c03a5ed9 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7785,7 +7785,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)