From owner-svn-src-all@FreeBSD.ORG  Mon Aug  9 00:23:58 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 250A7106564A;
	Mon,  9 Aug 2010 00:23:58 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 147F68FC08;
	Mon,  9 Aug 2010 00:23:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o790NvSn021658;
	Mon, 9 Aug 2010 00:23:57 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o790NvVn021656;
	Mon, 9 Aug 2010 00:23:57 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201008090023.o790NvVn021656@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Mon, 9 Aug 2010 00:23:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211087 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Aug 2010 00:23:58 -0000

Author: attilio
Date: Mon Aug  9 00:23:57 2010
New Revision: 211087
URL: http://svn.freebsd.org/changeset/base/211087

Log:
  The r208165 fixed a bug related to unsigned integer overflowing for the
  number of CPUs detection.
  However, that was not mention at all, the problem was not reported, the
  patch has not been MFCed and the fix is mostly improper.
  
  Fix the original overflow (caused when 32 CPUs must be detected) by
  just using a different mathematical computation (it also makes more
  explicit the size of operands involved, which is good in the moment
  waiting for a more complete support for a large number of CPUs).
  
  PR:		kern/148698
  Submitted by:	Joe Landers <jlanders at vmware dot com>
  Tested by:	gianni
  MFC after:	10 days

Modified:
  head/sys/kern/subr_smp.c

Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c	Sun Aug  8 23:24:23 2010	(r211086)
+++ head/sys/kern/subr_smp.c	Mon Aug  9 00:23:57 2010	(r211087)
@@ -504,10 +504,7 @@ smp_topo_none(void)
 	top = &group[0];
 	top->cg_parent = NULL;
 	top->cg_child = NULL;
-	if (mp_ncpus == sizeof(top->cg_mask) * 8)
-		top->cg_mask = -1;
-	else
-		top->cg_mask = (1 << mp_ncpus) - 1;
+	top->cg_mask = ~0U >> (32 - mp_ncpus);
 	top->cg_count = mp_ncpus;
 	top->cg_children = 0;
 	top->cg_level = CG_SHARE_NONE;