summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2015-06-23 06:30:36 +0000
committerkib <kib@FreeBSD.org>2015-06-23 06:30:36 +0000
commitae7c0e046118846e8deed771294aab6ae421a9ec (patch)
tree069db881f49e71836a96c56a596e65ccb3a3aaa4 /sys
parentcd6c92a5e0c75509fd4ce3df6e32364947f3b1f9 (diff)
downloadFreeBSD-src-ae7c0e046118846e8deed771294aab6ae421a9ec.zip
FreeBSD-src-ae7c0e046118846e8deed771294aab6ae421a9ec.tar.gz
Revert part of the r283303 (by jhb):
Revert MFC of r270223, which bumped MAXCPU on amd64 from 64 to 256. The cpuset_getaffinity(2) and cpuset_setaffinity(2) check minimum set size, which now fails for binaries compiled on 10.0 with MAXCPU == 64. Submitted by: jhb PR: 200802
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/include/param.h2
-rw-r--r--sys/sys/param.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index e8991b0..3d4722b 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 256
+#define MAXCPU 64
#endif
#else
#define MAXCPU 1
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 72e1c0e..ca1d69e 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 1001518 /* Master, propagated to newvers */
+#define __FreeBSD_version 1001519 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
OpenPOWER on IntegriCloud