diff options
author | Arve Hjønnevåg <arve@android.com> | 2008-12-10 20:06:28 -0800 |
---|---|---|
committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 13:34:55 -0700 |
commit | aca50f226d2a135774ba8681f49d907ab6e48829 (patch) | |
tree | 172935a7203ec5baf437c1cd2ebe64388b131ed9 | |
parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) |
sched: Enable might_sleep before initializing drivers.
This allows detection of init bugs in built-in drivers.
Signed-off-by: Arve Hjønnevåg <arve@android.com>
-rw-r--r-- | kernel/sched/core.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index e8b335016c5..5b582cabd31 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7093,13 +7093,24 @@ static inline int preempt_count_equals(int preempt_offset) return (nested == preempt_offset); } +static int __might_sleep_init_called; +int __init __might_sleep_init(void) +{ + __might_sleep_init_called = 1; + return 0; +} +early_initcall(__might_sleep_init); + 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()) || - system_state != SYSTEM_RUNNING || oops_in_progress) + oops_in_progress) + return; + if (system_state != SYSTEM_RUNNING && + (!__might_sleep_init_called || system_state != SYSTEM_BOOTING)) return; if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) return; |