Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux...

[sfrench/cifs-2.6.git] / arch / mn10300 / mm / fault.c

diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c
index 59c3da49d9d9e4ad08108bf2f1eebe8182f46e0c..0945409a802219cb8b1d7f09ef5410941a4756c0 100644 (file)
--- a/arch/mn10300/mm/fault.c
+++ b/arch/mn10300/mm/fault.c
@@ -28,8 +28,9 @@
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/hardirq.h>
-#include <asm/gdb-stub.h>
 #include <asm/cpu-regs.h>
+#include <asm/debugger.h>
+#include <asm/gdb-stub.h>
 
 /*
  * Unlock any spinlocks which will prevent us from getting the
@@ -306,10 +307,8 @@ no_context:
        printk(" printing pc:\n");
        printk(KERN_ALERT "%08lx\n", regs->pc);
 
-#ifdef CONFIG_GDBSTUB
-       gdbstub_intercept(
-               regs, fault_code & 0x00010000 ? EXCEP_IAERROR : EXCEP_DAERROR);
-#endif
+       debugger_intercept(fault_code & 0x00010000 ? EXCEP_IAERROR : EXCEP_DAERROR,
+                          SIGSEGV, SEGV_ACCERR, regs);
 
        page = PTBR;
        page = ((unsigned long *) __va(page))[address >> 22];