Merge branch 'slab/urgent' into slab/next

[pandora-kernel.git] / kernel / debug / kdb / kdb_main.c

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 6bc6e3b..63786e7 100644 (file)
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -145,7 +145,6 @@ static char *__env[] = {
 #endif
  "RADIX=16",
  "MDCOUNT=8",                  /* lines of md output */
- "BTARGS=9",                   /* 9 possible args in bt */
  KDB_PLATFORM_ENV,
  "DTABCOUNT=30",
  "NOSECT=1",
@@ -172,6 +171,7 @@ static char *__env[] = {
  (char *)0,
  (char *)0,
  (char *)0,
+ (char *)0,
 };
 
 static const int __nenv = (sizeof(__env) / sizeof(char *));
@@ -441,9 +441,9 @@ static int kdb_check_regs(void)
  *     symbol name, and offset to the caller.
  *
  *     The argument may consist of a numeric value (decimal or
- *     hexidecimal), a symbol name, a register name (preceeded by the
+ *     hexidecimal), a symbol name, a register name (preceded by the
  *     percent sign), an environment variable with a numeric value
- *     (preceeded by a dollar sign) or a simple arithmetic expression
+ *     (preceded by a dollar sign) or a simple arithmetic expression
  *     consisting of a symbol name, +/-, and a numeric constant value
  *     (offset).
  * Parameters:
@@ -1335,7 +1335,7 @@ void kdb_print_state(const char *text, int value)
  *     error           The hardware-defined error code
  *     reason2         kdb's current reason code.
  *                     Initially error but can change
- *                     acording to kdb state.
+ *                     according to kdb state.
  *     db_result       Result code from break or debug point.
  *     regs            The exception frame at time of fault/breakpoint.
  *                     should always be valid.
@@ -1386,7 +1386,7 @@ int kdb_main_loop(kdb_reason_t reason, kdb_reason_t reason2, int error,
                }
 
                if (result == KDB_CMD_KGDB) {
-                       if (!(KDB_STATE(DOING_KGDB) || KDB_STATE(DOING_KGDB2)))
+                       if (!KDB_STATE(DOING_KGDB))
                                kdb_printf("Entering please attach debugger "
                                           "or use $D#44+ or $3#33\n");
                        break;