git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
kernel
/
kmod.c
diff --git
a/kernel/kmod.c
b/kernel/kmod.c
index
d9b2858
..
1e79dfc
100644
(file)
--- a/
kernel/kmod.c
+++ b/
kernel/kmod.c
@@
-20,7
+20,6
@@
*/
#define __KERNEL_SYSCALLS__
*/
#define __KERNEL_SYSCALLS__
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/syscalls.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/syscalls.h>
@@
-214,11
+213,12
@@
static void __call_usermodehelper(void *data)
{
struct subprocess_info *sub_info = data;
pid_t pid;
{
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. */
/* 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
pid = kernel_thread(wait_for_helper, sub_info,
CLONE_FS | CLONE_FILES | SIGCHLD);
else
@@
-228,7
+228,7
@@
static void __call_usermodehelper(void *data)
if (pid < 0) {
sub_info->retval = pid;
complete(sub_info->complete);
if (pid < 0) {
sub_info->retval = pid;
complete(sub_info->complete);
- } else if (!
sub_info->
wait)
+ } else if (!wait)
complete(sub_info->complete);
}
complete(sub_info->complete);
}
@@
-250,7
+250,7
@@
static void __call_usermodehelper(void *data)
int call_usermodehelper_keys(char *path, char **argv, char **envp,
struct key *session_keyring, int wait)
{
int call_usermodehelper_keys(char *path, char **argv, char **envp,
struct key *session_keyring, int wait)
{
- DECLARE_COMPLETION(done);
+ DECLARE_COMPLETION
_ONSTACK
(done);
struct subprocess_info sub_info = {
.complete = &done,
.path = path,
struct subprocess_info sub_info = {
.complete = &done,
.path = path,