summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/uaccess.c
diff options
context:
space:
mode:
authorJeff Dike2006-04-19 07:21:41 +0200
committerLinus Torvalds2006-04-19 18:13:51 +0200
commitad28e029789ef46aebdfb9ece01d431ce1c637c8 (patch)
treee2e5dffefbb2484324ac4d0e74b77d312058b4a5 /arch/um/os-Linux/uaccess.c
parent[PATCH] m32r: update switch_to macro for tuning (diff)
downloadkernel-qcow2-linux-ad28e029789ef46aebdfb9ece01d431ce1c637c8.tar.gz
kernel-qcow2-linux-ad28e029789ef46aebdfb9ece01d431ce1c637c8.tar.xz
kernel-qcow2-linux-ad28e029789ef46aebdfb9ece01d431ce1c637c8.zip
[PATCH] uml: change sigjmp_buf to jmp_buf
Clean up the jmpbuf code. Since softints, we no longer use sig_setjmp, so the UML_SIGSETJMP wrapper now has a misleading name. Also, I forgot to change the buffers from sigjmp_buf to jmp_buf. 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.c4
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,
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;