From owner-p4-projects@FreeBSD.ORG Wed Dec 26 05:55:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EEB816A419; Wed, 26 Dec 2007 05:55:24 +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 3B1B916A417 for ; Wed, 26 Dec 2007 05:55:24 +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 2E99613C4D1 for ; Wed, 26 Dec 2007 05:55:24 +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 lBQ5tOLk064797 for ; Wed, 26 Dec 2007 05:55:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBQ5tNqP064794 for perforce@freebsd.org; Wed, 26 Dec 2007 05:55:23 GMT (envelope-from jb@freebsd.org) Date: Wed, 26 Dec 2007 05:55:23 GMT Message-Id: <200712260555.lBQ5tNqP064794@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 131647 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, 26 Dec 2007 05:55:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=131647 Change 131647 by jb@jb_freebsd1 on 2007/12/26 05:54:49 Define SMP_MAXCPU for use in kernel modules which have to dimension things based on the maximum number of CPUs that _could_ be in the kernel. The MAXCPU definition is only useful for things compiled into the kernel itself. At module build time, the state of the SMP configuration isn't known and modules are supposed to be able to load into UP and SMP kernels (which is why the atomic functions aren't inlined in modules). Affected files ... .. //depot/projects/dtrace/src/sys/amd64/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/arm/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/i386/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/ia64/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/powerpc/include/param.h#4 edit .. //depot/projects/dtrace/src/sys/sparc64/include/param.h#5 edit .. //depot/projects/dtrace/src/sys/sun4v/include/param.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/include/param.h#4 (text+ko) ==== @@ -79,8 +79,13 @@ #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 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/arm/include/param.h#4 (text+ko) ==== @@ -72,8 +72,13 @@ #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 2 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/i386/include/param.h#4 (text+ko) ==== @@ -65,8 +65,13 @@ #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 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/ia64/include/param.h#4 (text+ko) ==== @@ -78,8 +78,13 @@ #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 4 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif ==== //depot/projects/dtrace/src/sys/powerpc/include/param.h#4 (text+ko) ==== @@ -67,8 +67,13 @@ #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 2 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sparc64/include/param.h#5 (text+ko) ==== @@ -59,8 +59,13 @@ #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 16 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */ ==== //depot/projects/dtrace/src/sys/sun4v/include/param.h#5 (text+ko) ==== @@ -59,8 +59,13 @@ #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 32 +#define MAXCPU SMP_MAXCPU #else #define MAXCPU 1 #endif /* SMP */