diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-10-28 23:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-28 23:21:00 -0700 |
| commit | 4d42378e456e33655f0fad1ab6d49c49d6ccebb3 (patch) | |
| tree | fdaec7b43fa4d9e34d37e9cde4e6f4242498e50d /init | |
| parent | c1ec9cae63d7c8553172fddb199fbf61b7293c07 (diff) | |
| download | history-4d42378e456e33655f0fad1ab6d49c49d6ccebb3.tar.gz | |
[PATCH] key_init ordering fix
The data structures which are set up by key_init() are used by exec(). And
we're using exec() super-early via the hotplug events from
do_basic_setup():driver_init().
So call key_init() directly, prior to driver_init().
Cc: David S. Miller <davem@davemloft.net>
Cc: David Howells <dhowells@redhat.com>
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 91d6cbfa4ee775..e448aea6300090 100644 --- a/init/main.c +++ b/init/main.c @@ -45,6 +45,7 @@ #include <linux/unistd.h> #include <linux/rmap.h> #include <linux/mempolicy.h> +#include <linux/key.h> #include <asm/io.h> #include <asm/bugs.h> @@ -639,7 +640,7 @@ static void __init do_basic_setup(void) /* drivers will send hotplug events */ init_workqueues(); usermodehelper_init(); - + key_init(); driver_init(); #ifdef CONFIG_SYSCTL |