aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/uaccess.c
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-07-14 03:24:02 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-15 00:53:52 -0400
commita5df0d1a2c0f7dbd135d978d02daf2d99e62ff7a (patch)
tree89824d59364a431d332ce68d548068db4616e68c /arch/um/os-Linux/uaccess.c
parent8477b55ba11a49515b26573a90414b718179c908 (diff)
[PATCH] uml: tidy longjmp macro
The UML_SETJMP macro was requiring its users to pass in a argument which it could supply itself, since it wasn't used outside that invocation of the macro. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/os-Linux/uaccess.c')
-rw-r--r--arch/um/os-Linux/uaccess.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c
index e523719330b2..865f6a6a2590 100644
--- a/arch/um/os-Linux/uaccess.c
+++ b/arch/um/os-Linux/uaccess.c
@@ -14,11 +14,10 @@ unsigned long __do_user_copy(void *to, const void *from, int n,
14 int n), int *faulted_out) 14 int n), int *faulted_out)
15{ 15{
16 unsigned long *faddrp = (unsigned long *) fault_addr, ret; 16 unsigned long *faddrp = (unsigned long *) fault_addr, ret;
17 int enable;
18 17
19 jmp_buf jbuf; 18 jmp_buf jbuf;
20 *fault_catcher = &jbuf; 19 *fault_catcher = &jbuf;
21 if(UML_SETJMP(&jbuf, enable) == 0){ 20 if(UML_SETJMP(&jbuf) == 0){
22 (*op)(to, from, n); 21 (*op)(to, from, n);
23 ret = 0; 22 ret = 0;
24 *faulted_out = 0; 23 *faulted_out = 0;