diff options
| author | Hannes Reinecke <hare@suse.de> | 2004-08-22 22:46:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 22:46:30 -0700 |
| commit | e5f29853e9797a740708e0d38cecda5be168ac8a (patch) | |
| tree | 300086c4432f53eca1e99480f44dd9b4958232eb /init | |
| parent | 0a50caad8db2a2a4ab547d8e280ad29560fef37d (diff) | |
| download | history-e5f29853e9797a740708e0d38cecda5be168ac8a.tar.gz | |
[PATCH] Enable all events for initramfs
Currently most driver events are not sent out when using initramfs as
driver_init() (which triggers the events) is called before init_workqueues.
This patch rearranges the init calls so that the hotplug event queue is
enabled prior to calling driver_init(), hence we're getting all hotplug
events again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index e62a5694183da1..46fe75c96308f7 100644 --- a/init/main.c +++ b/init/main.c @@ -31,6 +31,7 @@ #include <linux/tty.h> #include <linux/gfp.h> #include <linux/percpu.h> +#include <linux/kmod.h> #include <linux/kernel_stat.h> #include <linux/security.h> #include <linux/workqueue.h> @@ -605,6 +606,10 @@ static void __init do_initcalls(void) */ static void __init do_basic_setup(void) { + /* drivers will send hotplug events */ + init_workqueues(); + usermodehelper_init(); + driver_init(); #ifdef CONFIG_SYSCTL @@ -614,7 +619,6 @@ static void __init do_basic_setup(void) /* Networking initialization needs a process context */ sock_init(); - init_workqueues(); do_initcalls(); } |