From 5eb2df1065b808a3ade39946cfafeb3061ea5a82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 30 Jul 2011 23:09:38 +0800 Subject: [PATCH] Revert "sched: Enable might_sleep before initializing drivers." This reverts commit 563036940546f44a6232bee51459e7ea7d2da2c7. --- kernel/sched.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 4a8163f7eb58..84f8f1020db3 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9581,24 +9581,13 @@ 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(char *file, int line, int preempt_offset) { #ifdef in_atomic static unsigned long prev_jiffy; /* ratelimiting */ if ((preempt_count_equals(preempt_offset) && !irqs_disabled()) || - oops_in_progress) - return; - if (system_state != SYSTEM_RUNNING && - (!__might_sleep_init_called || system_state != SYSTEM_BOOTING)) + system_state != SYSTEM_RUNNING || oops_in_progress) return; if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) return; -- 2.34.1