From owner-p4-projects@FreeBSD.ORG Tue Jan 29 22:40:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F9D16A41B; Tue, 29 Jan 2008 22:40:04 +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 20D2716A46C for ; Tue, 29 Jan 2008 22:40:04 +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 1014413C459 for ; Tue, 29 Jan 2008 22:40:04 +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 m0TMe3Sj032979 for ; Tue, 29 Jan 2008 22:40:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0TMe2MK032975 for perforce@freebsd.org; Tue, 29 Jan 2008 22:40:02 GMT (envelope-from jb@freebsd.org) Date: Tue, 29 Jan 2008 22:40:02 GMT Message-Id: <200801292240.m0TMe2MK032975@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 134419 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: Tue, 29 Jan 2008 22:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=134419 Change 134419 by jb@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 */