This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / drivers / slip_user.c

diff --git a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
index 3d8d4ca..1a52559 100644 (file)
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <sched.h>
 #include <string.h>
-#include <errno.h>
+#include <sys/errno.h>
 #include <sys/termios.h>
 #include <sys/wait.h>
 #include <sys/signal.h>
@@ -100,9 +100,7 @@ static int slip_tramp(char **argv, int fd)
                        printk("%s", output);
                        kfree(output);
                }
-               CATCH_EINTR(err = waitpid(pid, &status, 0));
-               if(err < 0)
-                       err = errno;
+               if(waitpid(pid, &status, 0) < 0) err = errno;
                else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
                        printk("'%s' didn't exit with status 0\n", argv[0]);
                        err = -EINVAL;