From owner-svn-src-stable-10@FreeBSD.ORG  Tue Jun 23 06:30:37 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@nevdull.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DBFCFAB3;
 Tue, 23 Jun 2015 06:30:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C7B67F25;
 Tue, 23 Jun 2015 06:30:37 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5N6UbB1027887;
 Tue, 23 Jun 2015 06:30:37 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5N6UbLv027885;
 Tue, 23 Jun 2015 06:30:37 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201506230630.t5N6UbLv027885@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 23 Jun 2015 06:30:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r284720 - in stable/10/sys: amd64/include sys
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2015 06:30:38 -0000

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,