diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
| commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
| tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /kernel/kmod.c | |
| parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
| parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) | |
| download | op-kernel-dev-803db244b9f71102e366fd689000c1417b9a7508.zip op-kernel-dev-803db244b9f71102e366fd689000c1417b9a7508.tar.gz | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'kernel/kmod.c')
| -rw-r--r-- | kernel/kmod.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 1d32def..5c470c5 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -197,11 +197,12 @@ static void __call_usermodehelper(void *data) { struct subprocess_info *sub_info = data; pid_t pid; + int wait = sub_info->wait; /* CLONE_VFORK: wait until the usermode helper has execve'd * successfully We need the data structures to stay around * until that is done. */ - if (sub_info->wait) + if (wait) pid = kernel_thread(wait_for_helper, sub_info, CLONE_FS | CLONE_FILES | SIGCHLD); else @@ -211,7 +212,7 @@ static void __call_usermodehelper(void *data) if (pid < 0) { sub_info->retval = pid; complete(sub_info->complete); - } else if (!sub_info->wait) + } else if (!wait) complete(sub_info->complete); } |
