lkml.org 
[lkml]   [2010]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/5] sched: Enable might_sleep before initializing drivers.
From
Date
On Fri, 2010-11-19 at 18:08 -0800, John Stultz wrote:
> From: Arve Hjønnevåg <arve@android.com>
>
> This allows detection of init bugs in built-in drivers.
>
> CC: Ingo Molnar <mingo@elte.hu>
> CC: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Arve Hjønnevåg <arve@android.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> kernel/sched.c | 13 ++++++++++++-
> 1 files changed, 12 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/sched.c b/kernel/sched.c
> index aa14a56..0b58415 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -8104,13 +8104,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;

Remind me, why isn't scheduler_running good enough?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-11-20 11:45    [W:0.125 / U:3.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site