summaryrefslogtreecommitdiffstats
path: root/arch/um/include
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2008-02-05 07:31:07 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 18:44:29 +0100
commit8efa3c9d545ab6adc5c5e001cbd7aee60909b3da (patch)
tree1ec5750233c242168f17a9669ff4ba4aa113a2e6 /arch/um/include
parentuml: customize tlb.h (diff)
downloadlinux-8efa3c9d545ab6adc5c5e001cbd7aee60909b3da.tar.xz
linux-8efa3c9d545ab6adc5c5e001cbd7aee60909b3da.zip
uml: eliminate setjmp_wrapper
setjmp_wrapper existed to provide setjmp to kernel code when UML used libc's setjmp and longjmp. Now that UML has its own implementation, this isn't needed and kernel code can invoke setjmp directly. do_buffer_op is massively cleaned up since it is no longer a callback from setjmp_wrapper and given a va_list from which it must extract its arguments. The actual setjmp is moved from buffer_op to do_op_one_page because the copy operation is inside an atomic section (kmap_atomic to kunmap_atomic) and it shouldn't be longjmp-ed out of. 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')
-rw-r--r--arch/um/include/os.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index daaafc8824b0..c8684b678eeb 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -235,7 +235,6 @@ extern void stack_protections(unsigned long address);
extern int raw(int fd);
extern void setup_machinename(char *machine_out);
extern void setup_hostinfo(char *buf, int len);
-extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
extern void os_dump_core(void) __attribute__ ((noreturn));
/* time.c */