Merge tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb

Pull KGDB/KDB fixes and cleanups from Jason Wessel:
 "For a change we removed more code than we added.  If people aren't
  using it we shouldn't be carrying it.  :-)

  Cleanups:
   - Remove kdb ssb command - there is no in kernel disassembler to
     support it

   - Remove kdb ll command - Always caused a kernel oops and there were
     no bug reports so no one was using this command

   - Use kernel ARRAY_SIZE macro instead of array computations

  Fixes:
   - Stop oops in kdb if user executes kdb_defcmd with args

   - kdb help command truncated text

   - ppc64 support for kgdbts

   - Add missing kconfig option from original kdb port for dealing with
     catastrophic kernel crashes such that you can reboot automatically
     on continue from kdb"

* tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
  kdb: Remove unhandled ssb command
  kdb: Prevent kernel oops with kdb_defcmd
  kdb: Remove the ll command
  kdb_main: fix help print
  kdb: Fix overlap in buffers with strcpy
  Fixed dead ifdef block by adding missing Kconfig option.
  kdb: Setup basic kdb state before invoking commands via kgdb
  kdb: use ARRAY_SIZE where possible
  kgdb/kgdbts: support ppc64
  kdb: A fix for kdb command table expansion

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb
index dbb58ae1b8e0..140e87824173 100644
--- a/lib/Kconfig.kgdb
+++ b/lib/Kconfig.kgdb
@@ -80,4 +80,22 @@ config KDB_KEYBOARD
         help
           KDB can use a PS/2 type keyboard for an input device
 
+config KDB_CONTINUE_CATASTROPHIC
+        int "KDB: continue after catastrophic errors"
+        depends on KGDB_KDB
+        default "0"
+        help
+          This integer controls the behaviour of kdb when the kernel gets a
+          catastrophic error, i.e. for a panic or oops.
+          When KDB is active and a catastrophic error occurs, nothing extra
+          will happen until you type 'go'.
+          CONFIG_KDB_CONTINUE_CATASTROPHIC == 0 (default). The first time
+          you type 'go', you will be warned by kdb. The secend time you type
+          'go', KDB tries to continue. No guarantees that the
+          kernel is still usable in this situation.
+          CONFIG_KDB_CONTINUE_CATASTROPHIC == 1. KDB tries to continue.
+          No guarantees that the kernel is still usable in this situation.
+          CONFIG_KDB_CONTINUE_CATASTROPHIC == 2. KDB forces a reboot.
+          If you are not sure, say 0.
+
 endif # KGDB