Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast
  m68k/atari: ARAnyM - Add support for network access
  m68k/atari: ARAnyM - Add support for console access
  m68k/atari: ARAnyM - Add support for block access
  m68k/atari: Initial ARAnyM support
  m68k: Kconfig - Remove unneeded "default n"
  m68k: Makefiles - Change to new flags variables
  m68k/amiga: Reclaim Chip RAM for PPC exception handlers
  m68k: Allow all kernel traps to be handled via exception fixups
  m68k: Use base_trap_init() to initialize vectors
  m68k: Add helper function handle_kernel_fault()

1 files changed, 1 insertions, 15 deletions

diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index a96394a0333d..2db6099784ba 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -18,7 +18,6 @@
 #include <asm/pgalloc.h>
 
 extern void die_if_kernel(char *, struct pt_regs *, long);
-extern const int frame_extra_sizes[]; /* in m68k/kernel/signal.c */
 
 int send_fault_sig(struct pt_regs *regs)
 {
@@ -35,21 +34,8 @@ int send_fault_sig(struct pt_regs *regs)
                 force_sig_info(siginfo.si_signo,
                                &siginfo, current);
         } else {
-                const struct exception_table_entry *fixup;
-
-                /* Are we prepared to handle this kernel fault? */
-                if ((fixup = search_exception_tables(regs->pc))) {
-                        struct pt_regs *tregs;
-                        /* Create a new four word stack frame, discarding the old
-                           one.  */
-                        regs->stkadj = frame_extra_sizes[regs->format];
-                        tregs = (struct pt_regs *)((ulong)regs + regs->stkadj);
-                        tregs->vector = regs->vector;
-                        tregs->format = 0;
-                        tregs->pc = fixup->fixup;
-                        tregs->sr = regs->sr;
+                if (handle_kernel_fault(regs))
                         return -1;
-                }
 
                 //if (siginfo.si_signo == SIGBUS)
                 //      force_sig_info(siginfo.si_signo,