Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / util.c

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index c47a2a7ce70e75614e425e7270b2e1364188b67d..3f5b1514e8a71a33513ccf613643fcb2e33fed5c 100644 (file)
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-#include <setjmp.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
@@ -107,11 +106,11 @@ int setjmp_wrapper(void (*proc)(void *, void *), ...)
        jmp_buf buf;
        int n;
 
-       n = sigsetjmp(buf, 1);
+       n = UML_SETJMP(&buf);
        if(n == 0){
                va_start(args, proc);
                (*proc)(&buf, &args);
        }
        va_end(args);
-       return(n);
+       return n;
 }