diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /kernel/kmod.c | |
parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'kernel/kmod.c')
-rw-r--r-- | kernel/kmod.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 1b7157af051c..1d32defa38ab 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -233,7 +233,7 @@ static void __call_usermodehelper(void *data) | |||
233 | int call_usermodehelper_keys(char *path, char **argv, char **envp, | 233 | int call_usermodehelper_keys(char *path, char **argv, char **envp, |
234 | struct key *session_keyring, int wait) | 234 | struct key *session_keyring, int wait) |
235 | { | 235 | { |
236 | DECLARE_COMPLETION(done); | 236 | DECLARE_COMPLETION_ONSTACK(done); |
237 | struct subprocess_info sub_info = { | 237 | struct subprocess_info sub_info = { |
238 | .complete = &done, | 238 | .complete = &done, |
239 | .path = path, | 239 | .path = path, |