From owner-p4-projects@FreeBSD.ORG Wed Jan 30 23:54:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6633B16A478; Wed, 30 Jan 2008 23:54:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC17316A420 for ; Wed, 30 Jan 2008 23:54:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DEFCB13C44B for ; Wed, 30 Jan 2008 23:54:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0UNsTKu022792 for ; Wed, 30 Jan 2008 23:54:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0UNsTMw022789 for perforce@freebsd.org; Wed, 30 Jan 2008 23:54:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 30 Jan 2008 23:54:29 GMT Message-Id: <200801302354.m0UNsTMw022789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 134507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jan 2008 23:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=134507 Change 134507 by jb@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 #include -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 #include -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