Merge branch 'master'

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

diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c
index 38d710158c3d816822c37a43cf3c32c0e0263255..166fb66995df87e58793c6f99a33334324eaddce 100644 (file)
--- a/arch/um/os-Linux/uaccess.c
+++ b/arch/um/os-Linux/uaccess.c
@@ -6,6 +6,7 @@
 
 #include <setjmp.h>
 #include <string.h>
+#include "longjmp.h"
 
 unsigned long __do_user_copy(void *to, const void *from, int n,
                             void **fault_addr, void **fault_catcher,
@@ -13,10 +14,11 @@ unsigned long __do_user_copy(void *to, const void *from, int n,
                                        int n), int *faulted_out)
 {
        unsigned long *faddrp = (unsigned long *) fault_addr, ret;
+       int enable;
 
        sigjmp_buf jbuf;
        *fault_catcher = &jbuf;
-       if(sigsetjmp(jbuf, 1) == 0){
+       if(UML_SIGSETJMP(&jbuf, enable) == 0){
                (*op)(to, from, n);
                ret = 0;
                *faulted_out = 0;