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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  MN10300: gcc 4.6 vs am33 inline assembly
  MN10300: Deprecate gdbstub
  MN10300: Allow KGDB to use the MN10300 serial ports
  MN10300: Emulate single stepping in KGDB on MN10300
  MN10300: Generalise kernel debugger kernel halt, reboot or power off hook
  KGDB: Notify GDB of machine halt, reboot or power off
  MN10300: Use KGDB
  MN10300: Create generic kernel debugger hooks
  MN10300: Create general kernel debugger cache flushing
  MN10300: Introduce a general config option for kernel debugger hooks
  MN10300: The icache invalidate functions should disable the icache first
  MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs

39 files changed, 1924 insertions, 502 deletions

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 10971be43061..d8ab97a73db2 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -3,6 +3,8 @@ config MN10300
         select HAVE_OPROFILE
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_HARDIRQS_NO_DEPRECATED
+        select HAVE_ARCH_TRACEHOOK
+        select HAVE_ARCH_KGDB
 
 config AM33_2
         def_bool n
@@ -401,9 +403,9 @@ comment "[!] NOTE: A lower number/level indicates a higher priority (0 is highes
 comment "____Non-maskable interrupt levels____"
 comment "The following must be set to a higher priority than local_irq_disable() and on-chip serial"
 
-config GDBSTUB_IRQ_LEVEL
-        int "GDBSTUB interrupt priority"
-        depends on GDBSTUB
+config DEBUGGER_IRQ_LEVEL
+        int "DEBUGGER interrupt priority"
+        depends on KERNEL_DEBUGGER
         range 0 1 if LINUX_CLI_LEVEL = 2
         range 0 2 if LINUX_CLI_LEVEL = 3
         range 0 3 if LINUX_CLI_LEVEL = 4
@@ -437,7 +439,7 @@ config LINUX_CLI_LEVEL
           EPSW.IM from 7.  Any interrupt is permitted for which the level is
           lower than EPSW.IM.
 
-          Certain interrupts, such as GDBSTUB and virtual MN10300 on-chip
+          Certain interrupts, such as DEBUGGER and virtual MN10300 on-chip
           serial DMA interrupts are allowed to interrupt normal disabled
           sections.
 
diff --git a/arch/mn10300/Kconfig.debug b/arch/mn10300/Kconfig.debug
index ce83c74b3fd7..bdbfd444a9ff 100644
--- a/arch/mn10300/Kconfig.debug
+++ b/arch/mn10300/Kconfig.debug
@@ -36,7 +36,7 @@ config KPROBES
 
 config GDBSTUB
         bool "Remote GDB kernel debugging"
-        depends on DEBUG_KERNEL
+        depends on DEBUG_KERNEL && DEPRECATED
         select DEBUG_INFO
         select FRAME_POINTER
         help
@@ -46,6 +46,9 @@ config GDBSTUB
           RAM to avoid excessive linking time. This is only useful for kernel
           hackers. If unsure, say N.
 
+          This is deprecated in favour of KGDB and will be removed in a later
+          version.
+
 config GDBSTUB_IMMEDIATE
         bool "Break into GDB stub immediately"
         depends on GDBSTUB
@@ -54,6 +57,14 @@ config GDBSTUB_IMMEDIATE
           possible, leaving the program counter at the beginning of
           start_kernel() in init/main.c.
 
+config GDBSTUB_ALLOW_SINGLE_STEP
+        bool "Allow software single-stepping in GDB stub"
+        depends on GDBSTUB && !SMP && !PREEMPT
+        help
+          Allow GDB stub to perform software single-stepping through the
+          kernel.  This doesn't work very well on SMP or preemptible kernels as
+          it uses temporary breakpoints to emulate single-stepping.
+
 config GDB_CONSOLE
         bool "Console output to GDB"
         depends on GDBSTUB
@@ -142,3 +153,7 @@ config GDBSTUB_ON_TTYSx
         default y
 
 endmenu
+
+config KERNEL_DEBUGGER
+        def_bool y
+        depends on GDBSTUB || KGDB
diff --git a/arch/mn10300/include/asm/debugger.h b/arch/mn10300/include/asm/debugger.h
new file mode 100644
index 000000000000..e1d3b083696c
--- /dev/null
+++ b/arch/mn10300/include/asm/debugger.h
@@ -0,0 +1,43 @@
+/* Kernel debugger for MN10300
+ *
+ * Copyright (C) 2011 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+
+#ifndef _ASM_DEBUGGER_H
+#define _ASM_DEBUGGER_H
+
+#if defined(CONFIG_KERNEL_DEBUGGER)
+
+extern int debugger_intercept(enum exception_code, int, int, struct pt_regs *);
+extern int at_debugger_breakpoint(struct pt_regs *);
+
+#ifndef CONFIG_MN10300_DEBUGGER_CACHE_NO_FLUSH
+extern void debugger_local_cache_flushinv(void);
+extern void debugger_local_cache_flushinv_one(u8 *);
+#else
+static inline void debugger_local_cache_flushinv(void) {}
+static inline void debugger_local_cache_flushinv_one(u8 *addr) {}
+#endif
+
+#else /* CONFIG_KERNEL_DEBUGGER */
+
+static inline int debugger_intercept(enum exception_code excep,
+                                     int signo, int si_code,
+                                     struct pt_regs *regs)
+{
+        return 0;
+}
+
+static inline int a