aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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