Merge branch 'linux-2.6'

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 90d7f2e8ea..29185cad9f 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -201,7 +201,7 @@ static int change_tramp(char **argv, char *output, int output_len)
         close(fds[1]);
 
         if (pid > 0)
-                CATCH_EINTR(err = waitpid(pid, NULL, 0));
+                helper_wait(pid, 0, "change_tramp");
         return pid;
 }