From 3e6558b693dd1e69e3177bc248977f067a769f14 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 20 Jul 2008 08:59:24 -0700 Subject: [PATCH] fastboot: hold the BKL over the async init call sequence Regular init calls are called with the BKL held; make sure the async init calls are also called with the BKL held. While this reduces parallelism a little, it does provide lock-for-lock compatibility. The hit to prallelism isn't too bad, most of the init calls are done immediately or actually block for their delays. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar --- init/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/init/main.c b/init/main.c index 6961de2..9e2aee8 100644 --- a/init/main.c +++ b/init/main.c @@ -744,8 +744,14 @@ static void __init do_async_initcalls(struct work_struct *dummy) { initcall_t *call; + /* + * For compatibility with normal init calls... take the BKL + * not pretty, not desirable, but compatibility first + */ + lock_kernel(); for (call = __async_initcall_start; call < __async_initcall_end; call++) do_one_initcall(*call); + unlock_kernel(); } static struct workqueue_struct *async_init_wq; -- 1.5.4.3