aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-01-09 23:34:08 +0100
committerSteven Rostedt <rostedt@rostedt.homelinux.com>2014-04-24 22:03:35 -0400
commit29bbeaa5caf1a3333e9b998566b5b09c8a0a2016 (patch)
tree61b81b65fb36c9324359902f48dafb7154c219f7
parent3c7a889c9cb3c54a77a96997c2f61bd63d464c59 (diff)
sched: Check for idle task in might_sleep()
Idle is not allowed to call sleeping functions ever! Cc: stable-rt@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-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 c631d62608dc..9f9dae3e6c23 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7591,7 +7591,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)