diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:05 -0700 |
| commit | fab95c55e3b94e219044dc7a558632d08c198771 (patch) | |
| tree | 2ce8bf6eb52e66ee69a0b03cf9ad60310279524e /arch/um/include/os.h | |
| parent | 0a7675aa204ac2470bb06f562557978b03914a71 (diff) | |
| download | op-kernel-dev-fab95c55e3b94e219044dc7a558632d08c198771.zip op-kernel-dev-fab95c55e3b94e219044dc7a558632d08c198771.tar.gz | |
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/os.h')
| -rw-r--r-- | arch/um/include/os.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 96f333c..c704851 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -193,7 +193,7 @@ extern int os_getpid(void); extern int os_getpgrp(void); extern void init_new_thread_signals(void); -extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr); +extern int run_kernel_thread(int (*fn)(void *), void *arg, jmp_buf **jmp_ptr); extern int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len, int r, int w, int x); @@ -206,7 +206,7 @@ extern void os_flush_stdout(void); /* uaccess.c */ extern 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); @@ -240,7 +240,6 @@ extern int set_signals(int enable); /* trap.c */ extern void os_fill_handlinfo(struct kern_handlers h); -extern void do_longjmp(void *p, int val); /* util.c */ extern void stack_protections(unsigned long address); |
