From owner-p4-projects@FreeBSD.ORG  Fri Sep  3 08:25:33 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9FAAF16A4D0; Fri,  3 Sep 2004 08:25:33 +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 7A05916A4CE
	for <perforce@freebsd.org>; Fri,  3 Sep 2004 08:25:33 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6CC5E43D39
	for <perforce@freebsd.org>; Fri,  3 Sep 2004 08:25:33 +0000 (GMT)
	(envelope-from julian@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 i838PXXj023514
	for <perforce@freebsd.org>; Fri, 3 Sep 2004 08:25:33 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i838PXIw023511
	for perforce@freebsd.org; Fri, 3 Sep 2004 08:25:33 GMT
	(envelope-from julian@freebsd.org)
Date: Fri, 3 Sep 2004 08:25:33 GMT
Message-Id: <200409030825.i838PXIw023511@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 60931 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, 03 Sep 2004 08:25:34 -0000

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

Change 60931 by julian@julian_ref on 2004/09/03 08:25:16

	IFC@60929

Affected files ...

.. //depot/projects/nsched/sys/kern/sched_4bsd.c#34 integrate
.. //depot/projects/nsched/sys/sys/smp.h#6 integrate

Differences ...

==== //depot/projects/nsched/sys/kern/sched_4bsd.c#34 (text+ko) ====

@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.53 2004/09/03 07:42:31 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.54 2004/09/03 08:19:31 julian Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,6 +48,7 @@
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
+#include <machine/smp.h>
 
 /*
  * INVERSE_ESTCPU_WEIGHT is only suitable for statclock() frequencies in

==== //depot/projects/nsched/sys/sys/smp.h#6 (text+ko) ====

@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $FreeBSD: src/sys/sys/smp.h,v 1.81 2004/09/03 07:42:31 julian Exp $
+ * $FreeBSD: src/sys/sys/smp.h,v 1.82 2004/09/03 08:19:31 julian Exp $
  */
 
 #ifndef _SYS_SMP_H_
@@ -49,16 +49,17 @@
 extern int smp_cpus;
 extern volatile cpumask_t started_cpus;
 extern volatile cpumask_t stopped_cpus;
+extern cpumask_t idle_cpus_mask;
+extern cpumask_t hlt_cpus_mask;
+extern cpumask_t logical_cpus_mask;
 #endif /* SMP */
 
 extern u_int mp_maxid;
+extern int mp_maxcpus;
 extern int mp_ncpus;
 extern volatile int smp_started;
 
 extern cpumask_t all_cpus;
-extern cpumask_t idle_cpus_mask;
-extern cpumask_t hlt_cpus_mask;
-extern cpumask_t logical_cpus_mask;
 
 /*
  * Macro allowing us to determine whether a CPU is absent at any given