aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/os.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-07-16 02:38:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:38 -0400
commitc43990162fc7f9d2f15a12797fdc6f9c0905f704 (patch)
tree64f8b776c4807da48971f3c24ca157c5e6ab921f /arch/um/include/os.h
parent42a359e31a0e438b5b978a8f0fecdbd3c86bb033 (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/include/os.h')
-rw-r--r--arch/um/include/os.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 4d9fb26387d5..930b261ea483 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -239,11 +239,9 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n,
239/* execvp.c */ 239/* execvp.c */
240extern int execvp_noalloc(char *buf, const char *file, char *const argv[]); 240extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);
241/* helper.c */ 241/* helper.c */
242extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, 242extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv);
243 unsigned long *stack_out);
244extern int run_helper_thread(int (*proc)(void *), void *arg, 243extern int run_helper_thread(int (*proc)(void *), void *arg,
245 unsigned int flags, unsigned long *stack_out, 244 unsigned int flags, unsigned long *stack_out);
246 int stack_order);
247extern int helper_wait(int pid); 245extern int helper_wait(int pid);
248 246
249 247