Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / um / include / os.h

diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 120ca21a513a03853a38abf2004a35a1d0b4b173..13a86bd383d3355fdaf4b30e9703b4968fb58ff8 100644 (file)
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -201,6 +201,7 @@ extern int os_getpgrp(void);
 
 #ifdef UML_CONFIG_MODE_TT
 extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));
+extern void stop(void);
 #endif
 extern void init_new_thread_signals(void);
 extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
@@ -232,6 +233,8 @@ extern unsigned long __do_user_copy(void *to, const void *from, int n,
                                    void (*op)(void *to, const void *from,
                                               int n), int *faulted_out);
 
+/* execvp.c */
+extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);
 /* helper.c */
 extern int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
                      unsigned long *stack_out);