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 /include/linux/key.h | |
| parent | c1ec9cae63d7c8553172fddb199fbf61b7293c07 (diff) | |
[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 'include/linux/key.h')
| -rw-r--r-- | include/linux/key.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index e914be777c4a..15eaba537341 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -263,6 +263,7 @@ extern int suid_keys(struct task_struct *tsk); extern int exec_keys(struct task_struct *tsk); extern void key_fsuid_changed(struct task_struct *tsk); extern void key_fsgid_changed(struct task_struct *tsk); +extern void key_init(void); #else /* CONFIG_KEYS */ @@ -278,6 +279,7 @@ extern void key_fsgid_changed(struct task_struct *tsk); #define exec_keys(t) do { } while(0) #define key_fsuid_changed(t) do { } while(0) #define key_fsgid_changed(t) do { } while(0) +#define key_init() do { } while(0) #endif /* CONFIG_KEYS */ #endif /* __KERNEL__ */ |