This commit was manufactured by cvs2svn to create tag

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

diff --git a/arch/um/kernel/frame.c b/arch/um/kernel/frame.c
index 4b349f2..c18386a 100644 (file)
--- a/arch/um/kernel/frame.c
+++ b/arch/um/kernel/frame.c
@@ -21,7 +21,6 @@
 #include "sysdep/sigcontext.h"
 #include "frame_user.h"
 #include "kern_util.h"
-#include "user_util.h"
 #include "ptrace_user.h"
 #include "os.h"
 
@@ -41,7 +40,7 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp,
        /* Wait for it to stop itself and continue it with a SIGUSR1 to force 
         * it into the signal handler.
         */
-       CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
+       n = waitpid(pid, &status, WUNTRACED);
        if(n < 0){
                printf("capture_stack : waitpid failed - errno = %d\n", errno);
                exit(1);
@@ -61,7 +60,7 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp,
         * At this point, the handler has stuffed the addresses of
         * sig, sc, and SA_RESTORER in raw.
         */
-       CATCH_EINTR(n = waitpid(pid, &status, WUNTRACED));
+       n = waitpid(pid, &status, WUNTRACED);
        if(n < 0){
                printf("capture_stack : waitpid failed - errno = %d\n", errno);
                exit(1);
@@ -83,8 +82,7 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp,
                       errno);
                exit(1);
        }
-       CATCH_EINTR(n = waitpid(pid, &status, 0));
-       if(n < 0){
+       if(waitpid(pid, &status, 0) < 0){
                printf("capture_stack : waitpid failed - errno = %d\n", errno);
                exit(1);
        }