summaryrefslogtreecommitdiff
path: root/i386/i386at
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-01-15 21:29:37 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-01-15 21:29:37 +0100
commitc5e1672a23634eb59f1f9d87f3fb7b6c9fc77029 (patch)
tree45b63bc60409eb1385e514de7d5fd7aabbe852c5 /i386/i386at
parent55dcf03512b06c209f0390d837f8bf36b45c7400 (diff)
Move -d and -H parse to kern/startup.c
The code is arch-independant, and reboot_on_panic, used by kern/debug.c would be undefined on non-i386. * i386/i386at/model_dep.c (reboot_on_panic, c_boot_entry): Move -d and -H parse to... * kern/startup.c (reboot_on_panic,setup_main): ... here. Include <string.h>
Diffstat (limited to 'i386/i386at')
-rw-r--r--i386/i386at/model_dep.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
index 953bcdc..cf8466d 100644
--- a/i386/i386at/model_dep.c
+++ b/i386/i386at/model_dep.c
@@ -134,10 +134,6 @@ void inittodr(); /* forward */
int rebootflag = 0; /* exported to kdintr */
-#if ! MACH_KBD
-boolean_t reboot_on_panic = 1;
-#endif
-
/* XX interrupt stack pointer and highwater mark, for locore.S. */
vm_offset_t int_stack_top, int_stack_high;
@@ -553,22 +549,6 @@ void c_boot_entry(vm_offset_t bi)
{
aout_db_sym_init(kern_sym_start, kern_sym_end, "mach", 0);
}
-
- /*
- * Cause a breakpoint trap to the debugger before proceeding
- * any further if the proper option flag was specified
- * on the kernel's command line.
- * XXX check for surrounding spaces.
- */
- if (strstr(kernel_cmdline, "-d ")) {
- cninit(); /* need console for debugger */
- SoftDebugger("init");
- }
-#else
- if (strstr (kernel_cmdline, "-H "))
- {
- reboot_on_panic = 0;
- }
#endif /* MACH_KDB */
machine_slot[0].is_cpu = TRUE;