PERFORCE change 60931 for review

[Julian Elischer]

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

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

	IFC at 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