diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-07-15 23:38:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:38 -0700 |
| commit | c43990162fc7f9d2f15a12797fdc6f9c0905f704 (patch) | |
| tree | 64f8b776c4807da48971f3c24ca157c5e6ab921f /arch/um/os-Linux/drivers | |
| parent | 42a359e31a0e438b5b978a8f0fecdbd3c86bb033 (diff) | |
uml: simplify helper stack handling
run_helper and run_helper_thread had arguments which were the same in all
callers. run_helper's stack_out was always NULL and run_helper_thread's
stack_order was always 0. These are now gone, and the constants folded
into the code.
Also fixed leaks of the helper stack in the AIO and SIGIO code.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/drivers')
| -rw-r--r-- | arch/um/os-Linux/drivers/ethertap_user.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/drivers/tuntap_user.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c index acba30161287..cac01b31ea95 100644 --- a/arch/um/os-Linux/drivers/ethertap_user.c +++ b/arch/um/os-Linux/drivers/ethertap_user.c @@ -117,7 +117,7 @@ static int etap_tramp(char *dev, char *gate, int control_me, pe_data.control_remote = control_remote; pe_data.control_me = control_me; pe_data.data_me = data_me; - pid = run_helper(etap_pre_exec, &pe_data, args, NULL); + pid = run_helper(etap_pre_exec, &pe_data, args); if(pid < 0) err = pid; diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c index 11a9779dc9f1..f848b4ea9343 100644 --- a/arch/um/os-Linux/drivers/tuntap_user.c +++ b/arch/um/os-Linux/drivers/tuntap_user.c @@ -83,7 +83,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote, data.stdout = remote; data.close_me = me; - pid = run_helper(tuntap_pre_exec, &data, argv, NULL); + pid = run_helper(tuntap_pre_exec, &data, argv); if(pid < 0) return -pid; |