diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-12-10 20:06:28 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:05 -0700 |
| commit | a69de5bf21baf09c6039586a560b5ec679979c00 (patch) | |
| tree | 6f463b8adefb6cdd4934e06f2b96b3259a4a5f9a /kernel | |
| parent | 37eb616c13e56c74bc389ca5b5fa415db2c8c00b (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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index dc85ceb90832..2aa4e56acd89 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7891,13 +7891,24 @@ static inline int preempt_count_equals(int preempt_offset) return (nested == PREEMPT_INATOMIC_BASE + 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) { #ifdef in_atomic static unsigned long prev_jiffy; /* ratelimiting */ 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; |