From owner-p4-projects@FreeBSD.ORG  Fri Oct 29 21:23:40 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 48DDE16A4D0; Fri, 29 Oct 2004 21:23:40 +0000 (GMT)
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 0C7CD16A4CE
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 21:23:40 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0207F43D46
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 21:23:40 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9TLNdAB000262
	for <perforce@freebsd.org>; Fri, 29 Oct 2004 21:23:39 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9TLNdAI000259
	for perforce@freebsd.org; Fri, 29 Oct 2004 21:23:39 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 29 Oct 2004 21:23:39 GMT
Message-Id: <200410292123.i9TLNdAI000259@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 63950 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>
X-List-Received-Date: Fri, 29 Oct 2004 21:23:41 -0000

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

Change 63950 by jhb@jhb_slimer on 2004/10/29 21:23:12

	Really fix this.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#73 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#73 (text+ko) ====

@@ -422,12 +422,13 @@
 	for (i = 1, x = 0; x < MAXCPU; x++) {
 		if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp)
 			continue;
-		KASSERT(i < mp_ncpus,
-		    ("mp_ncpus and actual cpus are out of whack"));
 		if (cpu_info[x].cpu_disabled)
 			printf("  cpu (AP): APIC ID: %2d (disabled)\n", x);
-		else
+		else {
+			KASSERT(i < mp_ncpus,
+			    ("mp_ncpus and actual cpus are out of whack"));
 			printf(" cpu%d (AP): APIC ID: %2d\n", i++, x);
+		}
 	}
 }