Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Jul 2011 00:37:24 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r224207 - in head/sys: amd64/include arm/include conf i386/include ia64/include mips/include powerpc/include sparc64/include
Message-ID:  <201107190037.p6J0bO6K046031@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: attilio
Date: Tue Jul 19 00:37:24 2011
New Revision: 224207
URL: http://svn.freebsd.org/changeset/base/224207

Log:
  Add the possibility to specify from kernel configs MAXCPU value.
  This patch is going to help in cases like mips flavours where you
  want a more granular support on MAXCPU.
  
  No MFC is previewed for this patch.
  
  Tested by:	pluknet
  Approved by:	re (kib)

Modified:
  head/sys/amd64/include/param.h
  head/sys/arm/include/param.h
  head/sys/conf/NOTES
  head/sys/conf/options
  head/sys/i386/include/param.h
  head/sys/ia64/include/param.h
  head/sys/mips/include/param.h
  head/sys/powerpc/include/param.h
  head/sys/sparc64/include/param.h

Modified: head/sys/amd64/include/param.h
==============================================================================
--- head/sys/amd64/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/amd64/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -64,7 +64,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif

Modified: head/sys/arm/include/param.h
==============================================================================
--- head/sys/arm/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/arm/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -61,7 +61,9 @@
 #define	MID_MACHINE	MID_ARM6 
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		2
+#endif
 #else
 #define	MAXCPU		1
 #endif /* SMP || KLD_MODULE */

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/conf/NOTES	Tue Jul 19 00:37:24 2011	(r224207)
@@ -213,6 +213,10 @@ options 	SCHED_STATS
 # Mandatory:
 options 	SMP			# Symmetric MultiProcessor Kernel
 
+# MAXCPU defines the maximum number of CPUs that can boot in the system.
+# A default value should be already present, for every architecture.
+options 	MAXCPU=32
+
 # ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin
 # if the thread that currently owns the mutex is executing on another
 # CPU.  This behaviour is enabled by default, so this option can be used

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/conf/options	Tue Jul 19 00:37:24 2011	(r224207)
@@ -570,6 +570,7 @@ DFLTPHYS		opt_global.h
 DIAGNOSTIC		opt_global.h
 INVARIANT_SUPPORT	opt_global.h
 INVARIANTS		opt_global.h
+MAXCPU			opt_global.h
 MAXPHYS			opt_global.h
 MCLSHIFT		opt_global.h
 MUTEX_DEBUG		opt_global.h

Modified: head/sys/i386/include/param.h
==============================================================================
--- head/sys/i386/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/i386/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -68,7 +68,9 @@
 #define MID_MACHINE	MID_I386
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif /* SMP || KLD_MODULE */

Modified: head/sys/ia64/include/param.h
==============================================================================
--- head/sys/ia64/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/ia64/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -62,7 +62,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		32
+#endif
 #else
 #define MAXCPU		1
 #endif

Modified: head/sys/mips/include/param.h
==============================================================================
--- head/sys/mips/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/mips/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -87,7 +87,9 @@
 
 #ifdef SMP
 #define	MAXSMPCPU	32
+#ifndef MAXCPU
 #define	MAXCPU		MAXSMPCPU
+#endif
 #else
 #define	MAXSMPCPU	1
 #define	MAXCPU		1

Modified: head/sys/powerpc/include/param.h
==============================================================================
--- head/sys/powerpc/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/powerpc/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -68,7 +68,9 @@
 #endif
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define	MAXCPU		8
+#endif
 #else
 #define	MAXCPU		1
 #endif /* SMP || KLD_MODULE */

Modified: head/sys/sparc64/include/param.h
==============================================================================
--- head/sys/sparc64/include/param.h	Mon Jul 18 22:00:21 2011	(r224206)
+++ head/sys/sparc64/include/param.h	Tue Jul 19 00:37:24 2011	(r224207)
@@ -50,7 +50,9 @@
 #define MID_MACHINE	MID_SPARC64
 
 #if defined(SMP) || defined(KLD_MODULE)
+#ifndef MAXCPU
 #define MAXCPU		16
+#endif
 #else
 #define MAXCPU		1
 #endif /* SMP || KLD_MODULE */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107190037.p6J0bO6K046031>