Pull trivial1 into release branch

[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 166fb66995df87e58793c6f99a33334324eaddce..e523719330b27cb2b0a29bd1dacbf15bc8b1ca05 100644 (file)
--- a/arch/um/os-Linux/uaccess.c
+++ b/arch/um/os-Linux/uaccess.c
@@ -16,9 +16,9 @@ unsigned long __do_user_copy(void *to, const void *from, int n,
        unsigned long *faddrp = (unsigned long *) fault_addr, ret;
        int enable;
 
-       sigjmp_buf jbuf;
+       jmp_buf jbuf;
        *fault_catcher = &jbuf;
-       if(UML_SIGSETJMP(&jbuf, enable) == 0){
+       if(UML_SETJMP(&jbuf, enable) == 0){
                (*op)(to, from, n);
                ret = 0;
                *faulted_out = 0;