diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-25 20:33:17 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-29 00:23:40 +0200 |
| commit | 68acfdcb477abdbf875e33e4a950094c8de08f41 (patch) | |
| tree | 0982025165c86fad6cbb5612f3801bd6be1f7c28 /arch/m68k/kernel | |
| parent | generic ...copy_..._user primitives (diff) | |
| download | linux-68acfdcb477abdbf875e33e4a950094c8de08f41.tar.xz linux-68acfdcb477abdbf875e33e4a950094c8de08f41.zip | |
m68k: switch to generic extable.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/signal.c | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/traps.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index 093b7c42fb85..6f945bb5ffbd 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -88,7 +88,7 @@ static inline int frame_extra_sizes(int f) return frame_size_change[f]; } -int handle_kernel_fault(struct pt_regs *regs) +int fixup_exception(struct pt_regs *regs) { const struct exception_table_entry *fixup; struct pt_regs *tregs; diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index a926d2c88898..c1cc4e99aa94 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -1016,8 +1016,13 @@ asmlinkage void trap_c(struct frame *fp) /* traced a trapping instruction on a 68020/30, * real exception will be executed afterwards. */ - } else if (!handle_kernel_fault(&fp->ptregs)) - bad_super_trap(fp); + return; + } +#ifdef CONFIG_MMU + if (fixup_exception(&fp->ptregs)) + return; +#endif + bad_super_trap(fp); return; } |