diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-12-10 20:06:28 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 10:38:25 -0700 |
| commit | bbe594b835f8a3ecaf3367a94f3a144ed012cde1 (patch) | |
| tree | 1c02216d862e67b7700183b24b97a85b45936c7d | |
| parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (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 f5c6635b806..4bf263e8040 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6942,13 +6942,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; |