27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
Subject: sched: Check for idle task in might_sleep()
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 09 Jan 2013 23:34:08 +0100
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/3.10/patches-3.10.4-rt1.tar.xz
|
|
|
|
Idle is not allowed to call sleeping functions ever!
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
kernel/sched/core.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
Index: linux-stable/kernel/sched/core.c
|
|
===================================================================
|
|
--- linux-stable.orig/kernel/sched/core.c
|
|
+++ linux-stable/kernel/sched/core.c
|
|
@@ -7481,7 +7481,8 @@ void __might_sleep(const char *file, int
|
|
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)
|