This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/kernel/trap_user.c b/arch/um/kernel/trap_user.c
index d12eac6..6744ca6 100644 (file)
--- a/arch/um/kernel/trap_user.c
+++ b/arch/um/kernel/trap_user.c
@@ -32,14 +32,7 @@ void kill_child_dead(int pid)
 {
        kill(pid, SIGKILL);
        kill(pid, SIGCONT);
-       do {
-               int n;
-               CATCH_EINTR(n = waitpid(pid, NULL, 0));
-               if (n > 0)
-                       kill(pid, SIGCONT);
-               else
-                       break;
-       } while(1);
+       while(waitpid(pid, NULL, 0) > 0) kill(pid, SIGCONT);
 }
 
 /* Unlocked - don't care if this is a bit off */
@@ -127,7 +120,7 @@ void alarm_handler(int sig, struct sigcontext sc)
 
 void do_longjmp(void *b, int val)
 {
-       sigjmp_buf *buf = b;
+       jmp_buf *buf = b;
 
        siglongjmp(*buf, val);
 }