svn commit: r284720 - in stable/10/sys: amd64/include sys

[Konstantin Belousov]

Author: kib
Date: Tue Jun 23 06:30:36 2015
New Revision: 284720
URL: https://svnweb.freebsd.org/changeset/base/284720

Log:
  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

Modified:
  stable/10/sys/amd64/include/param.h
  stable/10/sys/sys/param.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/amd64/include/param.h
==============================================================================
--- stable/10/sys/amd64/include/param.h	Tue Jun 23 06:12:14 2015	(r284719)
+++ stable/10/sys/amd64/include/param.h	Tue Jun 23 06:30:36 2015	(r284720)
@@ -65,7 +65,7 @@
 
 #if defined(SMP) || defined(KLD_MODULE)
 #ifndef MAXCPU
-#define MAXCPU		256
+#define MAXCPU		64
 #endif
 #else
 #define MAXCPU		1

Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Tue Jun 23 06:12:14 2015	(r284719)
+++ stable/10/sys/sys/param.h	Tue Jun 23 06:30:36 2015	(r284720)
@@ -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,