Disable the code that halts secondary processors in cpu_reboot(). Halting

the secondary works, but not when called from here?!  XXX!
This commit is contained in:
thorpej 1998-09-29 21:59:33 +00:00
parent ebf8ba9c52
commit 16b0d8f1e4
1 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.148 1998/09/29 07:07:09 thorpej Exp $ */ /* $NetBSD: machdep.c,v 1.149 1998/09/29 21:59:33 thorpej Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -81,7 +81,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.148 1998/09/29 07:07:09 thorpej Exp $"); __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.149 1998/09/29 21:59:33 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1328,6 +1328,7 @@ haltsys:
doshutdownhooks(); doshutdownhooks();
#if defined(MULTIPROCESSOR) #if defined(MULTIPROCESSOR)
#if 0 /* XXX doesn't work when called from here?! */
/* Kill off any secondary CPUs. */ /* Kill off any secondary CPUs. */
for (cpu_id = 0; cpu_id < hwrpb->rpb_pcs_cnt; cpu_id++) { for (cpu_id = 0; cpu_id < hwrpb->rpb_pcs_cnt; cpu_id++) {
if (cpu_id == hwrpb->rpb_primary_cpu_id || if (cpu_id == hwrpb->rpb_primary_cpu_id ||
@ -1336,6 +1337,7 @@ haltsys:
cpu_halt_secondary(cpu_id); cpu_halt_secondary(cpu_id);
} }
#endif #endif
#endif
#ifdef BOOTKEY #ifdef BOOTKEY
printf("hit any key to %s...\n", howto & RB_HALT ? "halt" : "reboot"); printf("hit any key to %s...\n", howto & RB_HALT ? "halt" : "reboot");