Messages in this thread Patch in this message | | | Date | Sat, 22 Feb 2014 10:02:05 -0800 | From | tip-bot for Thomas Gleixner <> | Subject | [tip:sched/core] sched: Check for idle task in might_sleep() |
| |
Commit-ID: db273be2a7d42f92b3471e0f717982928214a650 Gitweb: http://git.kernel.org/tip/db273be2a7d42f92b3471e0f717982928214a650 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Fri, 7 Feb 2014 20:58:38 +0100 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Sat, 22 Feb 2014 18:07:50 +0100
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> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1391803122-4425-3-git-send-email-bigeasy@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/sched/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 06da865..a01fe6c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6927,7 +6927,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)
| |