4 files changed, 2 insertions, 55 deletions

diff --git a/arch/mn10300/include/asm/exceptions.h b/arch/mn10300/include/asm/exceptions.h
index fa16466ef3f9..3f3826abc745 100644
--- a/arch/mn10300/include/asm/exceptions.h
+++ b/arch/mn10300/include/asm/exceptions.h
@@ -15,8 +15,8 @@
 
 /*
  * define the breakpoint instruction opcode to use
- * - note that the JTAG unit steals 0xFF, so we want to avoid that if we can
- *   (can use 0xF7)
+ * - note that the JTAG unit steals 0xFF, so you can't use JTAG and GDBSTUB at
+ *   the same time.
  */
 #define GDBSTUB_BKPT            0xFF
 
@@ -90,7 +90,6 @@ enum exception_code {
 
 extern void __set_intr_stub(enum exception_code code, void *handler);
 extern void set_intr_stub(enum exception_code code, void *handler);
-extern void set_jtag_stub(enum exception_code code, void *handler);
 
 struct pt_regs;
 
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index 3d394b4eefba..b82ce7b47fcb 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -216,31 +216,6 @@ ENTRY(irq_handler)
 
 ###############################################################################
 #
-# Monitor Signal handler entry point
-#
-###############################################################################
-ENTRY(monitor_signal)
-        movbu   (0xae000001),d1
-        cmp     1,d1
-        beq     monsignal
-        ret     [],0
-
-monsignal:
-        or      EPSW_NMID,epsw
-        mov     d0,a0
-        mov     a0,sp
-        mov     (REG_EPSW,fp),d1
-        and     ~EPSW_nSL,d1
-        mov     d1,(REG_EPSW,fp)
-        movm    (sp),[d2,d3,a2,a3,exreg0,exreg1,exother]
-        mov     (sp),a1
-        mov     a1,usp
-        movm    (sp),[other]
-        add     4,sp
-here:   jmp     0x8e000008-here+0x8e000008
-
-###############################################################################
-#
 # Double Fault handler entry point
 # - note that there will not be a stack, D0/A0 will hold EPSW/PC as were
 #
diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c
index 91365adba4f5..a64604b512d5 100644
--- a/arch/mn10300/kernel/traps.c
+++ b/arch/mn10300/kernel/traps.c
@@ -538,28 +538,6 @@ void __init set_intr_stub(enum exception_code code, void *handler)
 }
 
 /*
- * set an interrupt stub to invoke the JTAG unit and then jump to a handler
- */
-void __init set_jtag_stub(enum exception_code code, void *handler)
-{
-        unsigned long addr;
-        u8 *vector = (u8 *)(CONFIG_INTERRUPT_VECTOR_BASE + code);
-
-        addr = (unsigned long) handler - ((unsigned long) vector + 1);
-        vector[0] = 0xff;               /* PI to jump into JTAG debugger */
-        vector[1] = 0xdc;               /* jmp handler */
-        vector[2] = addr;
-        vector[3] = addr >> 8;
-        vector[4] = addr >> 16;
-        vector[5] = addr >> 24;
-        vector[6] = 0xcb;
-        vector[7] = 0xcb;
-
-        mn10300_dcache_flush_inv();
-        flush_icache_range((unsigned long) vector, (unsigned long) vector + 8);
-}
-
-/*
  * initialise the exception table
  */
 void __init trap_init(void)
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c
index 81f153fa51b4..906e4c8f9ab1 100644
--- a/arch/mn10300/mm/fault.c
+++ b/arch/mn10300/mm/fault.c
@@ -100,8 +100,6 @@ static void print_pagetable_entries(pgd_t *pgdir, unsigned long address)
 }
 #endif
 
-asmlinkage void monitor_signal(struct pt_regs *);
-
 /*
  * This routine handles page faults.  It determines the address,
  * and the problem, and then passes it off to one of the appropriate
@@ -279,7 +277,6 @@ good_area:
  */
 bad_area:
         up_read(&mm->mmap_sem);
-        monitor_signal(regs);
 
         /* User mode accesses just cause a SIGSEGV */
         if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) {
@@ -292,7 +289,6 @@ bad_area:
         }
 
 no_context:
-        monitor_signal(regs);
         /* Are we prepared to handle this kernel fault?  */
         if (fixup_exception(regs))
                 return;
@@ -345,7 +341,6 @@ out_of_memory:
 
 do_sigbus:
         up_read(&mm->mmap_sem);
-        monitor_signal(regs);
 
         /*
          * Send a sigbus, regardless of whether we were in kernel