diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-20 18:36:05 -0400 | 
| commit | 857c68f733eea07f11a061caea43a38fed61adb7 (patch) | |
| tree | 4567a9e91f717b22143ac1ccb0fb5323ac15afd3 /arch/um/os-Linux/uaccess.c | |
| parent | 4741c336d27dec3ea68a35659abb8dc82b142388 (diff) | |
| parent | 402a26f0c040077ed6f941eefac5a6971f0d5f40 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/os-Linux/uaccess.c')
| -rw-r--r-- | arch/um/os-Linux/uaccess.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c index 166fb66995df..e523719330b2 100644 --- 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, | |||
| 16 | unsigned long *faddrp = (unsigned long *) fault_addr, ret; | 16 | unsigned long *faddrp = (unsigned long *) fault_addr, ret; | 
| 17 | int enable; | 17 | int enable; | 
| 18 | 18 | ||
| 19 | sigjmp_buf jbuf; | 19 | jmp_buf jbuf; | 
| 20 | *fault_catcher = &jbuf; | 20 | *fault_catcher = &jbuf; | 
| 21 | if(UML_SIGSETJMP(&jbuf, enable) == 0){ | 21 | if(UML_SETJMP(&jbuf, enable) == 0){ | 
| 22 | (*op)(to, from, n); | 22 | (*op)(to, from, n); | 
| 23 | ret = 0; | 23 | ret = 0; | 
| 24 | *faulted_out = 0; | 24 | *faulted_out = 0; | 
