git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
be14779
..
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 */
#endif
"RADIX=16",
"MDCOUNT=8", /* lines of md output */
- "BTARGS=9", /* 9 possible args in bt */
KDB_PLATFORM_ENV,
"DTABCOUNT=30",
"NOSECT=1",
KDB_PLATFORM_ENV,
"DTABCOUNT=30",
"NOSECT=1",
@@
-172,6
+171,7
@@
static char *__env[] = {
(char *)0,
(char *)0,
(char *)0,
(char *)0,
(char *)0,
(char *)0,
+ (char *)0,
};
static const int __nenv = (sizeof(__env) / sizeof(char *));
};
static const int __nenv = (sizeof(__env) / sizeof(char *));
@@
-1386,7
+1386,7
@@
int kdb_main_loop(kdb_reason_t reason, kdb_reason_t reason2, int error,
}
if (result == KDB_CMD_KGDB) {
}
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;
kdb_printf("Entering please attach debugger "
"or use $D#44+ or $3#33\n");
break;