Date: Wed, 30 Jan 2008 23:32:04 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134501 for review Message-ID: <200801302332.m0UNW4B0021727@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=134501 Change 134501 by jb@jb_freebsd1 on 2008/01/30 23:31:36 Implement a suggestion from jhb@ to use KLD_MODULE and set MAXCPU to the SMP case instead of adding the SMP_MAXCPU definition. This means that kernel modules should always see the number of CPUs a SMP kernel would support (W^5 == which was what we wanted). Affected files ... .. //depot/projects/dtrace/src/sys/amd64/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/arm/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/i386/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/ia64/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/pc98/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/powerpc/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/sparc64/include/param.h#6 edit .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#6 edit .. //depot/projects/dtrace7/src/sys/amd64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/arm/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/i386/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/ia64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/pc98/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/powerpc/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/sparc64/include/param.h#3 edit .. //depot/projects/dtrace7/src/sys/sun4v/include/param.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/include/param.h#5 (text+ko) ==== @@ -79,13 +79,8 @@ #define MACHINE_ARCH "amd64" #endif -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/arm/include/param.h#5 (text+ko) ==== @@ -72,13 +72,8 @@ #endif #define MID_MACHINE MID_ARM6 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/i386/include/param.h#5 (text+ko) ==== @@ -65,13 +65,8 @@ #endif #define MID_MACHINE MID_I386 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/ia64/include/param.h#5 (text+ko) ==== @@ -78,13 +78,8 @@ #define MACHINE_ARCH "ia64" #endif -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 4 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 4 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/pc98/include/param.h#4 (text+ko) ==== ==== //depot/projects/dtrace/src/sys/powerpc/include/param.h#5 (text+ko) ==== @@ -67,13 +67,8 @@ #endif #define MID_MACHINE MID_POWERPC -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sparc64/include/param.h#6 (text+ko) ==== @@ -59,13 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sun4v/include/param.h#6 (text+ko) ==== @@ -59,13 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -/* - * SMP_MAXCPU - maximum number of CPUs in the kernel. Use this in kernel - * modules to allow for both SMP and !SMP cases. - */ -#define SMP_MAXCPU 32 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 32 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/amd64/include/param.h#3 (text+ko) ==== @@ -79,9 +79,8 @@ #define MACHINE_ARCH "amd64" #endif -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/arm/include/param.h#3 (text+ko) ==== @@ -72,9 +72,8 @@ #endif #define MID_MACHINE MID_ARM6 -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/i386/include/param.h#3 (text+ko) ==== @@ -65,9 +65,8 @@ #endif #define MID_MACHINE MID_I386 -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/ia64/include/param.h#3 (text+ko) ==== @@ -78,9 +78,8 @@ #define MACHINE_ARCH "ia64" #endif -#define SMP_MAXCPU 4 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 4 #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace7/src/sys/pc98/include/param.h#3 (text+ko) ==== ==== //depot/projects/dtrace7/src/sys/powerpc/include/param.h#3 (text+ko) ==== @@ -67,9 +67,8 @@ #endif #define MID_MACHINE MID_POWERPC -#define SMP_MAXCPU 2 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 2 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sparc64/include/param.h#3 (text+ko) ==== @@ -59,9 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -#define SMP_MAXCPU 16 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 16 #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace7/src/sys/sun4v/include/param.h#3 (text+ko) ==== @@ -59,9 +59,8 @@ #endif #define MID_MACHINE MID_SPARC64 -#define SMP_MAXCPU 32 -#ifdef SMP -#define MAXCPU SMP_MAXCPU +#if defined(SMP) || defined(KLD_MODULE) +#define MAXCPU 32 #else #define MAXCPU 1 #endif /* SMP */help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801302332.m0UNW4B0021727>