PERFORCE change 134507 for review

[John Birrell]

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

Change 134507 by jb at jb_freebsd1 on 2008/01/30 23:54:21

	Use MAXCPU rather than SMP_MAXCPU now I've implemented jhb@'s
	suggestion to use KLD_MODULE in the SMP ifdef.

Affected files ...

.. //depot/projects/dtrace/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#3 edit
.. //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic.c#2 edit
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 edit
.. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#3 edit
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#28 edit
.. //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#2 edit
.. //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 edit
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#2 edit
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 edit

Differences ...

==== //depot/projects/dtrace/src/sys/cddl/cyclic/amd64/cyclic_machdep.c#3 (text+ko) ====

@@ -73,7 +73,7 @@
 	cyclic_uninit();
 }
 
-static hrtime_t exp_due[SMP_MAXCPU];
+static hrtime_t exp_due[MAXCPU];
 
 /*
  * This function is the one registered by the machine dependent

==== //depot/projects/dtrace/src/sys/cddl/cyclic/cyclic.c#2 (text+ko) ====

@@ -1214,7 +1214,7 @@
 
 	idp->cyi_omni_hdlr = *omni;
 
-	for (i = 0; i < SMP_MAXCPU; i++) {
+	for (i = 0; i < MAXCPU; i++) {
 		if (pcpu_find(i) == NULL)
 			continue;
 

==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 (text+ko) ====

@@ -61,11 +61,11 @@
 	char *first;
 	char *last;
 	char *next;
-} dtrace_debug_data[SMP_MAXCPU];
+} dtrace_debug_data[MAXCPU];
 
 static char dtrace_debug_bufr[DTRACE_DEBUG_BUFR_SIZE];
 
-static volatile u_long	dtrace_debug_flag[SMP_MAXCPU];
+static volatile u_long	dtrace_debug_flag[MAXCPU];
 
 static void
 dtrace_debug_lock(int cpu)

==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#3 (text+ko) ====

@@ -35,9 +35,9 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 
-cpu_core_t	cpu_core[SMP_MAXCPU];
+cpu_core_t	cpu_core[MAXCPU];
 kmutex_t	cpu_lock;
-solaris_cpu_t	solaris_cpu[SMP_MAXCPU];
+solaris_cpu_t	solaris_cpu[MAXCPU];
 
 /*
  *  OpenSolaris subsystem initialisation.
@@ -56,7 +56,7 @@
 	 * that the asserts work. On FreeBSD, if a CPU exists, it is
 	 * enabled.
 	 */
-	for (i = 0; i < SMP_MAXCPU; i++) {
+	for (i = 0; i < MAXCPU; i++) {
 		solaris_cpu[i].cpuid = i;
 		solaris_cpu[i].cpu_flags &= CPU_ENABLE;
 	}

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#28 (text) ====

@@ -276,7 +276,7 @@
 #define vuprintf	vprintf
 #define ttoproc(_a)	((_a)->td_proc)
 #define crgetzoneid(_a)	0
-#define	NCPU		SMP_MAXCPU
+#define	NCPU		MAXCPU
 #define SNOCD		0
 #define CPU_ON_INTR(_a)	0
 

==== //depot/projects/dtrace7/src/sys/cddl/cyclic/cyclic.c#2 (text+ko) ====

@@ -1214,7 +1214,7 @@
 
 	idp->cyi_omni_hdlr = *omni;
 
-	for (i = 0; i < SMP_MAXCPU; i++) {
+	for (i = 0; i < MAXCPU; i++) {
 		if (pcpu_find(i) == NULL)
 			continue;
 

==== //depot/projects/dtrace7/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 (text+ko) ====

@@ -61,11 +61,11 @@
 	char *first;
 	char *last;
 	char *next;
-} dtrace_debug_data[SMP_MAXCPU];
+} dtrace_debug_data[MAXCPU];
 
 static char dtrace_debug_bufr[DTRACE_DEBUG_BUFR_SIZE];
 
-static volatile u_long	dtrace_debug_flag[SMP_MAXCPU];
+static volatile u_long	dtrace_debug_flag[MAXCPU];
 
 static void
 dtrace_debug_lock(int cpu)

==== //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris.c#2 (text+ko) ====

@@ -35,9 +35,9 @@
 #include <sys/module.h>
 #include <sys/mutex.h>
 
-cpu_core_t	cpu_core[SMP_MAXCPU];
+cpu_core_t	cpu_core[MAXCPU];
 kmutex_t	cpu_lock;
-solaris_cpu_t	solaris_cpu[SMP_MAXCPU];
+solaris_cpu_t	solaris_cpu[MAXCPU];
 
 /*
  *  OpenSolaris subsystem initialisation.
@@ -56,7 +56,7 @@
 	 * that the asserts work. On FreeBSD, if a CPU exists, it is
 	 * enabled.
 	 */
-	for (i = 0; i < SMP_MAXCPU; i++) {
+	for (i = 0; i < MAXCPU; i++) {
 		solaris_cpu[i].cpuid = i;
 		solaris_cpu[i].cpu_flags &= CPU_ENABLE;
 	}

==== //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text) ====

@@ -276,7 +276,7 @@
 #define vuprintf	vprintf
 #define ttoproc(_a)	((_a)->td_proc)
 #define crgetzoneid(_a)	0
-#define	NCPU		SMP_MAXCPU
+#define	NCPU		MAXCPU
 #define SNOCD		0
 #define CPU_ON_INTR(_a)	0