diff options
| -rw-r--r-- | sys/ddb/db_command.c | 11 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/db_interface.c | 14 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/db_interface.c | 11 |
3 files changed, 10 insertions, 26 deletions
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 36c5112..98fd39a 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -68,6 +68,7 @@ SET_DECLARE(db_show_cmd_set, struct command); static db_cmdfcn_t db_fncall; static db_cmdfcn_t db_gdb; +static db_cmdfcn_t db_halt; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_stack_trace; @@ -134,7 +135,8 @@ static struct command db_commands[] = { { "show", 0, 0, &db_show_table }, { "ps", db_ps, 0, 0 }, { "gdb", db_gdb, 0, 0 }, - { "registers", db_show_regs, 0, 0 }, + { "halt", db_halt, 0, 0 }, + { "reboot", db_reset, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, @@ -538,6 +540,13 @@ db_fncall(dummy1, dummy2, dummy3, dummy4) } static void +db_halt(db_expr_t dummy, boolean_t dummy2, db_expr_t dummy3, char *dummy4) +{ + + cpu_halt(); +} + +static void db_kill(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; boolean_t dummy2; diff --git a/sys/powerpc/powerpc/db_interface.c b/sys/powerpc/powerpc/db_interface.c index 9ea9046..a46ead6 100644 --- a/sys/powerpc/powerpc/db_interface.c +++ b/sys/powerpc/powerpc/db_interface.c @@ -8,7 +8,6 @@ #include <sys/cons.h> #include <sys/kdb.h> #include <sys/ktr.h> -#include <sys/linker_set.h> #include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> @@ -84,16 +83,3 @@ void db_show_mdpcpu(struct pcpu *pc) { } - -/* - * PowerPC-specific ddb commands: - */ -DB_COMMAND(reboot, db_reboot) -{ - cpu_reset(); -} - -DB_COMMAND(halt, db_halt) -{ - cpu_halt(); -} diff --git a/sys/sparc64/sparc64/db_interface.c b/sys/sparc64/sparc64/db_interface.c index 77e1493..95bea8a 100644 --- a/sys/sparc64/sparc64/db_interface.c +++ b/sys/sparc64/sparc64/db_interface.c @@ -32,7 +32,6 @@ #include <sys/cons.h> #include <sys/kdb.h> #include <sys/ktr.h> -#include <sys/linker_set.h> #include <sys/lock.h> #include <sys/pcpu.h> #include <sys/proc.h> @@ -94,13 +93,3 @@ void db_show_mdpcpu(struct pcpu *pc) { } - -DB_COMMAND(reboot, db_reboot) -{ - cpu_reset(); -} - -DB_COMMAND(halt, db_halt) -{ - cpu_halt(); -} |
