This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / um / os-Linux / drivers / tuntap_user.c

diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index f40c627..054874d 100644 (file)
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -18,7 +18,6 @@
 #include "net_user.h"
 #include "tuntap.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "user.h"
 #include "helper.h"
 #include "os.h"
@@ -109,7 +108,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
                       errno);
                return(-errno);
        }
-       CATCH_EINTR(waitpid(pid, NULL, 0));
+       waitpid(pid, NULL, 0);
 
        cmsg = CMSG_FIRSTHDR(&msg);
        if(cmsg == NULL){