Module Name: src
Committed By: sborrill
Date: Sat Oct 31 13:25:56 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha [netbsd-5]: machdep.c
Log Message:
Pull up the following revisions(s) (requested by mhitch in ticket #1118):
sys/arch/alpha/alpha/machdep.c: revision 1.321
Ensures the cpu running the shutdown waits for the correct cpus to halt
and thus stop the machine hanging at shutdown.
To generate a diff of this commit:
cvs rdiff -u -r1.307.4.1 -r1.307.4.2 src/sys/arch/alpha/alpha/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/machdep.c
diff -u src/sys/arch/alpha/alpha/machdep.c:1.307.4.1 src/sys/arch/alpha/alpha/machdep.c:1.307.4.2
--- src/sys/arch/alpha/alpha/machdep.c:1.307.4.1 Mon Feb 2 03:30:32 2009
+++ src/sys/arch/alpha/alpha/machdep.c Sat Oct 31 13:25:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $ */
+/* $NetBSD: machdep.c,v 1.307.4.2 2009/10/31 13:25:56 sborrill Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.307.4.1 2009/02/02 03:30:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.307.4.2 2009/10/31 13:25:56 sborrill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -965,8 +965,7 @@
{
#if defined(MULTIPROCESSOR)
u_long cpu_id = cpu_number();
- u_long wait_mask = (1UL << cpu_id) |
- (1UL << hwrpb->rpb_primary_cpu_id);
+ u_long wait_mask;
int i;
#endif
@@ -1000,6 +999,9 @@
* Halt all other CPUs. If we're not the primary, the
* primary will spin, waiting for us to halt.
*/
+ cpu_id = cpu_number(); /* may have changed cpu */
+ wait_mask = (1UL << cpu_id) | (1UL << hwrpb->rpb_primary_cpu_id);
+
alpha_broadcast_ipi(ALPHA_IPI_HALT);
/* Ensure any CPUs paused by DDB resume execution so they can halt */
