From 594db92802b3e7cb6ec09347e2dc34ea6fed1727 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 13 Oct 2008 23:50:08 +0200
Subject: [PATCH] --- yaml --- r: 117083 b: refs/heads/master c:
 a802dd0eb5fc97a50cf1abb1f788a8f6cc5db635 h: refs/heads/master i:   117081:
 b551e8754104f4a00487926063d0da07b8dd5ac2   117079:
 ff960037aac5d53ceff602ac52de2a7e79482b9a v: v3

---
 [refs]            | 2 +-
 trunk/init/main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fc0dece7c8ec..b43ddb160864 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f44dd164f37336f7e17fabf5740698fd10635172
+refs/heads/master: a802dd0eb5fc97a50cf1abb1f788a8f6cc5db635
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 3d68aaaf6160..6c7fd137c8cd 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -767,8 +767,6 @@ static void __init do_initcalls(void)
 static void __init do_basic_setup(void)
 {
 	rcu_init_sched(); /* needed by module_init stage. */
-	/* drivers will send hotplug events */
-	init_workqueues();
 	usermodehelper_init();
 	driver_init();
 	init_irq_proc();
@@ -852,6 +850,8 @@ static int __init kernel_init(void * unused)
 
 	cad_pid = task_pid(current);
 
+	init_workqueues();
+
 	smp_prepare_cpus(setup_max_cpus);
 
 	do_pre_smp_initcalls();