aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAttilio Rao <attilio@FreeBSD.org>2011-07-19 13:00:30 +0000
committerAttilio Rao <attilio@FreeBSD.org>2011-07-19 13:00:30 +0000
commit786ef92b7b0c86c4e0c92509abade475a7be9631 (patch)
tree2edb7740577df4ba44b84edf0682e0a46abdbc60 /sys
parent732772c7011a4d51329d719dd8bb11e516d55141 (diff)
downloadsrc-786ef92b7b0c86c4e0c92509abade475a7be9631.tar.gz
src-786ef92b7b0c86c4e0c92509abade475a7be9631.zip
Bump MAXCPU for amd64, ia64 and XLP mips appropriately.
From now on, default values for FreeBSD will be 64 maxiumum supported CPUs on amd64 and ia64 and 128 for XLP. All the other architectures seem already capped appropriately (with the exception of sparc64 which needs further support on jalapeno flavour). Bump __FreeBSD_version in order to reflect KBI/KPI brekage introduced during the infrastructure cleanup for supporting MAXCPU > 32. This covers cpumask_t retiral too. The switch is considered completed at the present time, so for whatever bug you may experience that is reconducible to that area, please report immediately. Requested by: marcel, jchandra Tested by: pluknet, sbruno Approved by: re (kib)
Notes
Notes: svn path=/head/; revision=224217
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/include/param.h2
-rw-r--r--sys/ia64/include/param.h2
-rw-r--r--sys/mips/conf/XLP1
-rw-r--r--sys/mips/conf/XLP641
-rw-r--r--sys/mips/conf/XLPN321
-rw-r--r--sys/sys/param.h2
6 files changed, 6 insertions, 3 deletions
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 74d4d21827bb..6dbeb4035925 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -65,7 +65,7 @@
#if defined(SMP) || defined(KLD_MODULE)
#ifndef MAXCPU
-#define MAXCPU 32
+#define MAXCPU 64
#endif
#else
#define MAXCPU 1
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index a3684ab09e3e..d996441f6246 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -63,7 +63,7 @@
#if defined(SMP) || defined(KLD_MODULE)
#ifndef MAXCPU
-#define MAXCPU 32
+#define MAXCPU 64
#endif
#else
#define MAXCPU 1
diff --git a/sys/mips/conf/XLP b/sys/mips/conf/XLP
index 6843534b72fe..48d8df35f262 100644
--- a/sys/mips/conf/XLP
+++ b/sys/mips/conf/XLP
@@ -36,6 +36,7 @@ options SCHED_ULE # ULE scheduler
options SMP
options PREEMPTION # Enable kernel thread preemption
#options FULL_PREEMPTION # Enable kernel thread preemption
+options MAXCPU=128 # XLP can probe 128 CPUs
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/mips/conf/XLP64 b/sys/mips/conf/XLP64
index 997a1f61c7fc..d70098e88cc1 100644
--- a/sys/mips/conf/XLP64
+++ b/sys/mips/conf/XLP64
@@ -38,6 +38,7 @@ options SCHED_ULE # ULE scheduler
options SMP
options PREEMPTION # Enable kernel thread preemption
#options FULL_PREEMPTION # Enable kernel thread preemption
+options MAXCPU=128 # XLP can probe 128 CPUs
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/mips/conf/XLPN32 b/sys/mips/conf/XLPN32
index 97c73a80d695..81cd17f5fecf 100644
--- a/sys/mips/conf/XLPN32
+++ b/sys/mips/conf/XLPN32
@@ -37,6 +37,7 @@ options SCHED_ULE # ULE scheduler
options SMP
options PREEMPTION # Enable kernel thread preemption
#options FULL_PREEMPTION # Enable kernel thread preemption
+options MAXCPU=128 # XLP can probe 128 CPUs
options INET # InterNETworking
options INET6 # IPv6 communications protocols
options FFS # Berkeley Fast Filesystem
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 4f54eaca13a8..fbb43dfcf76a 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 900039 /* Master, propagated to newvers */
+#define __FreeBSD_version 900040 /* Master, propagated to newvers */
#ifdef _KERNEL
#define P_OSREL_SIGSEGV 700004