diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-12-10 20:06:28 -0800 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2011-03-29 13:57:02 -0700 |
| commit | b4a5a803a83156913350744b60e5750ecd70721d (patch) | |
| tree | fc1e920276ddad4a65b390eba96c93eeee3d7559 /kernel | |
| parent | c34aa7202ad7f45a7bd7b9ccf01e5564ef839b0b (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 42eab5a8437d..7ddccfdad829 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -8078,13 +8078,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; |