From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 13:34:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C940216A4D1; Sun, 16 Nov 2003 13:34:35 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9CB0316A4CE
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:34:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 811F243FBD
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:34:34 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAGLYYXJ021397
	for <perforce@freebsd.org>; Sun, 16 Nov 2003 13:34:34 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAGLYYeU021394
	for perforce@freebsd.org; Sun, 16 Nov 2003 13:34:34 -0800 (PST)
	(envelope-from peter@freebsd.org)
Message-Id: <200311162134.hAGLYYeU021394@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42569 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
Date: Sun, 16 Nov 2003 21:34:36 -0000
X-Original-Date: Sun, 16 Nov 2003 13:34:34 -0800 (PST)
X-List-Received-Date: Sun, 16 Nov 2003 21:34:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=42569

Change 42569 by peter@peter_overcee on 2003/11/16 13:34:28

	deal with smp_active.  This should be MI.

Affected files ...

.. //depot/projects/hammer/sys/kern/kern_switch.c#12 edit

Differences ...

==== //depot/projects/hammer/sys/kern/kern_switch.c#12 (text+ko) ====

@@ -97,7 +97,7 @@
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/sched.h>
-#if defined(SMP) && defined(__i386__)
+#if defined(SMP) && (defined(__i386__) || defined(__amd64__))
 #include <sys/smp.h>
 #endif
 #include <machine/critical.h>
@@ -124,7 +124,7 @@
 	struct thread *td;
 	struct ksegrp *kg;
 
-#if defined(SMP) && defined(__i386__)
+#if defined(SMP) && (defined(__i386__) || defined(__amd64__))
 	if (smp_active == 0 && PCPU_GET(cpuid) != 0) {
 		/* Shutting down, run idlethread on AP's */
 		td = PCPU_GET(idlethread);