diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:27:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | fab95c55e3b94e219044dc7a558632d08c198771 (patch) | |
tree | 2ce8bf6eb52e66ee69a0b03cf9ad60310279524e /arch/um/include/um_uaccess.h | |
parent | 0a7675aa204ac2470bb06f562557978b03914a71 (diff) |
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/include/um_uaccess.h')
-rw-r--r-- | arch/um/include/um_uaccess.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h index 5ef311a1a394..fdfc06b85605 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/um_uaccess.h | |||
@@ -30,6 +30,10 @@ | |||
30 | extern int copy_from_user(void *to, const void __user *from, int n); | 30 | extern int copy_from_user(void *to, const void __user *from, int n); |
31 | extern int copy_to_user(void __user *to, const void *from, int n); | 31 | extern int copy_to_user(void __user *to, const void *from, int n); |
32 | 32 | ||
33 | extern int __do_copy_to_user(void *to, const void *from, int n, | ||
34 | void **fault_addr, jmp_buf **fault_catcher); | ||
35 | extern void __do_copy(void *to, const void *from, int n); | ||
36 | |||
33 | /* | 37 | /* |
34 | * strncpy_from_user: - Copy a NUL terminated string from userspace. | 38 | * strncpy_from_user: - Copy a NUL terminated string from userspace. |
35 | * @dst: Destination address, in kernel space. This buffer must be at | 39 | * @dst: Destination address, in kernel space. This buffer must be at |