PERFORCE change 134419 for review
John Birrell
jb at FreeBSD.org
Tue Jan 29 14:40:04 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=134419
Change 134419 by jb at jb_freebsd1 on 2008/01/29 22:39:09
Merge the SMP_MAXCPU definitions from the dtrace project.
Affected files ...
.. //depot/projects/dtrace7/src/sys/amd64/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/arm/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/i386/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/ia64/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/modules/Makefile#5 edit
.. //depot/projects/dtrace7/src/sys/pc98/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/powerpc/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/sparc64/include/param.h#2 edit
.. //depot/projects/dtrace7/src/sys/sun4v/include/param.h#2 edit
Differences ...
==== //depot/projects/dtrace7/src/sys/amd64/include/param.h#2 (text+ko) ====
@@ -79,8 +79,9 @@
#define MACHINE_ARCH "amd64"
#endif
+#define SMP_MAXCPU 16
#ifdef SMP
-#define MAXCPU 16
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif
==== //depot/projects/dtrace7/src/sys/arm/include/param.h#2 (text+ko) ====
@@ -72,8 +72,9 @@
#endif
#define MID_MACHINE MID_ARM6
+#define SMP_MAXCPU 2
#ifdef SMP
-#define MAXCPU 2
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif /* SMP */
==== //depot/projects/dtrace7/src/sys/i386/include/param.h#2 (text+ko) ====
@@ -65,8 +65,9 @@
#endif
#define MID_MACHINE MID_I386
+#define SMP_MAXCPU 16
#ifdef SMP
-#define MAXCPU 16
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif /* SMP */
==== //depot/projects/dtrace7/src/sys/ia64/include/param.h#2 (text+ko) ====
@@ -78,8 +78,9 @@
#define MACHINE_ARCH "ia64"
#endif
+#define SMP_MAXCPU 4
#ifdef SMP
-#define MAXCPU 4
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif
==== //depot/projects/dtrace7/src/sys/modules/Makefile#5 (text+ko) ====
@@ -23,7 +23,6 @@
${_arcmsr} \
${_arcnet} \
${_arl} \
- ${_asmc} \
${_asr} \
ata \
${_ath} \
@@ -456,7 +455,6 @@
_ahb= ahb
_arcmsr= arcmsr
_arl= arl
-_asmc= asmc
_asr= asr
_bios= bios
_ciss= ciss
@@ -511,7 +509,6 @@
_agp= agp
_an= an
_arcmsr= arcmsr
-_asmc= asmc
_ath= ath
_ath_hal= ath_hal
_ath_rate_amrr= ath_rate_amrr
==== //depot/projects/dtrace7/src/sys/pc98/include/param.h#2 (text+ko) ====
==== //depot/projects/dtrace7/src/sys/powerpc/include/param.h#2 (text+ko) ====
@@ -67,8 +67,9 @@
#endif
#define MID_MACHINE MID_POWERPC
+#define SMP_MAXCPU 2
#ifdef SMP
-#define MAXCPU 2
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif /* SMP */
==== //depot/projects/dtrace7/src/sys/sparc64/include/param.h#2 (text+ko) ====
@@ -59,8 +59,9 @@
#endif
#define MID_MACHINE MID_SPARC64
+#define SMP_MAXCPU 16
#ifdef SMP
-#define MAXCPU 16
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif /* SMP */
==== //depot/projects/dtrace7/src/sys/sun4v/include/param.h#2 (text+ko) ====
@@ -59,8 +59,9 @@
#endif
#define MID_MACHINE MID_SPARC64
+#define SMP_MAXCPU 32
#ifdef SMP
-#define MAXCPU 32
+#define MAXCPU SMP_MAXCPU
#else
#define MAXCPU 1
#endif /* SMP */
More information about the p4-projects
mailing list