diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:03:19 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:51 +0100 |
| commit | 6582b7f7743da6ce3e3714e9e8b18e0e073d4acd (patch) | |
| tree | 649346d2333865ccd4bb4d560ceb50c39139c5c2 /arch/um/sys-x86/fault.c | |
| parent | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (diff) | |
| download | blackbird-obmc-linux-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.tar.gz blackbird-obmc-linux-6582b7f7743da6ce3e3714e9e8b18e0e073d4acd.zip | |
um: merge arch/um/sys-{i386,x86_64}
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-x86/fault.c')
| -rw-r--r-- | arch/um/sys-x86/fault.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/um/sys-x86/fault.c b/arch/um/sys-x86/fault.c new file mode 100644 index 000000000000..d670f68532f4 --- /dev/null +++ b/arch/um/sys-x86/fault.c @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) + * Licensed under the GPL + */ + +#include "sysdep/ptrace.h" + +/* These two are from asm-um/uaccess.h and linux/module.h, check them. */ +struct exception_table_entry +{ + unsigned long insn; + unsigned long fixup; +}; + +const struct exception_table_entry *search_exception_tables(unsigned long add); + +/* Compare this to arch/i386/mm/extable.c:fixup_exception() */ +int arch_fixup(unsigned long address, struct uml_pt_regs *regs) +{ + const struct exception_table_entry *fixup; + + fixup = search_exception_tables(address); + if (fixup != 0) { + UPT_IP(regs) = fixup->fixup; + return 1; + } + return 0; +} |
