summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/uaccess.c
diff options
context:
space:
mode:
authorJeff Dike2007-10-16 10:27:05 +0200
committerLinus Torvalds2007-10-16 18:43:05 +0200
commitfab95c55e3b94e219044dc7a558632d08c198771 (patch)
tree2ce8bf6eb52e66ee69a0b03cf9ad60310279524e /arch/um/os-Linux/uaccess.c
parentuml: remove __u64 usage from physical memory subsystem (diff)
downloadkernel-qcow2-linux-fab95c55e3b94e219044dc7a558632d08c198771.tar.gz
kernel-qcow2-linux-fab95c55e3b94e219044dc7a558632d08c198771.tar.xz
kernel-qcow2-linux-fab95c55e3b94e219044dc7a558632d08c198771.zip
uml: get rid of do_longjmp
do_longjmp used to be needed when UML didn't have its own implementation of setjmp and longjmp. They came from libc, and couldn't be called directly from kernel code, as the libc jmp_buf couldn't be imported there. do_longjmp was a userspace function which served to provide longjmp access to kernel code. This is gone, and a number of void * pointers can now be jmp_buf *. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/uaccess.c')
-rw-r--r--arch/um/os-Linux/uaccess.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/uaccess.c b/arch/um/os-Linux/uaccess.c
index bbb73a650370..8d27b6d1df91 100644
--- a/arch/um/os-Linux/uaccess.c
+++ b/arch/um/os-Linux/uaccess.c
@@ -8,7 +8,7 @@
#include "longjmp.h"
unsigned long __do_user_copy(void *to, const void *from, int n,
- void **fault_addr, void **fault_catcher,
+ void **fault_addr, jmp_buf **fault_catcher,
void (*op)(void *to, const void *from,
int n), int *faulted_out)
{