aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 06da865043ec..a01fe6cfdb9b 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)
6927 static unsigned long prev_jiffy; /* ratelimiting */ 6927 static unsigned long prev_jiffy; /* ratelimiting */
6928 6928
6929 rcu_sleep_check(); /* WARN_ON_ONCE() by default, no rate limit reqd. */ 6929 rcu_sleep_check(); /* WARN_ON_ONCE() by default, no rate limit reqd. */
6930 if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) || 6930 if ((preempt_count_equals(preempt_offset) && !irqs_disabled() &&
6931 !is_idle_task(current)) ||
6931 system_state != SYSTEM_RUNNING || oops_in_progress) 6932 system_state != SYSTEM_RUNNING || oops_in_progress)
6932 return; 6933 return;
6933 if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) 6934 if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy)