This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / kernel / user_util.c

diff --git a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
index a953a08..d646f1d 100644 (file)
--- a/arch/um/kernel/user_util.c
+++ b/arch/um/kernel/user_util.c
@@ -5,7 +5,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <fcntl.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/mman.h> 
@@ -34,7 +33,6 @@
 #define COMMAND_LINE_SIZE _POSIX_ARG_MAX
 
 /* Changed in linux_main and setup_arch, which run before SMP is started */
-char saved_command_line[COMMAND_LINE_SIZE] = { 0 };
 char command_line[COMMAND_LINE_SIZE] = { 0 };
 
 void add_arg(char *cmd_line, char *arg)
@@ -82,7 +80,8 @@ int wait_for_stop(int pid, int sig, int cont_type, void *relay)
        int status, ret;
 
        while(1){
-               if(((ret = waitpid(pid, &status, WUNTRACED)) < 0) ||
+               ret = waitpid(pid, &status, WUNTRACED);
+               if((ret < 0) ||
                   !WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
                        if(ret < 0){
                                if(errno == EINTR) continue;
@@ -119,17 +118,6 @@ int wait_for_stop(int pid, int sig, int cont_type, void *relay)
        }
 }
 
-int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags)
-{
-       int pid;
-
-       pid = clone(fn, sp, flags, arg);
-       if(pid < 0) return(-1);
-       wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
-       ptrace(PTRACE_CONT, pid, 0, 0);
-       return(pid);
-}
-
 int raw(int fd, int complain)
 {
        struct termios tt;