diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-25 14:33:17 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-28 18:23:40 -0400 |
commit | 68acfdcb477abdbf875e33e4a950094c8de08f41 (patch) | |
tree | 0982025165c86fad6cbb5612f3801bd6be1f7c28 /arch/m68k/kernel/traps.c | |
parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
download | talos-op-linux-68acfdcb477abdbf875e33e4a950094c8de08f41.tar.gz talos-op-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/traps.c')
-rw-r--r-- | arch/m68k/kernel/traps.c | 9 |
1 files changed, 7 insertions, 2 deletions
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; } |