From owner-svn-src-projects@FreeBSD.ORG  Sun May 22 20:24:36 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD2551065674;
	Sun, 22 May 2011 20:24:36 +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 BE82D8FC18;
	Sun, 22 May 2011 20:24:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4MKOa30089145;
	Sun, 22 May 2011 20:24:36 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4MKOaq7089142;
	Sun, 22 May 2011 20:24:36 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201105222024.p4MKOaq7089142@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sun, 22 May 2011 20:24:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222194 - in projects/largeSMP/sys/i386: i386 xen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 May 2011 20:24:36 -0000

Author: attilio
Date: Sun May 22 20:24:36 2011
New Revision: 222194
URL: http://svn.freebsd.org/changeset/base/222194

Log:
  Add a "safety belt" check for lsb setting.
  I don't think it is really necessary because the cpumask is known to be
  != 0, but it is just in case.
  
  Requested by:	kib

Modified:
  projects/largeSMP/sys/i386/i386/pmap.c
  projects/largeSMP/sys/i386/xen/pmap.c

Modified: projects/largeSMP/sys/i386/i386/pmap.c
==============================================================================
--- projects/largeSMP/sys/i386/i386/pmap.c	Sun May 22 20:19:01 2011	(r222193)
+++ projects/largeSMP/sys/i386/i386/pmap.c	Sun May 22 20:24:36 2011	(r222194)
@@ -1947,6 +1947,7 @@ pmap_lazyfix(pmap_t pmap)
 
 		/* Find least significant set bit. */
 		lsb = cpusetobj_ffs(&mask);
+		MPASS(lsb != 0);
 		lsb--;
 		CPU_SETOF(lsb, &mask);
 		mtx_lock_spin(&smp_ipi_mtx);

Modified: projects/largeSMP/sys/i386/xen/pmap.c
==============================================================================
--- projects/largeSMP/sys/i386/xen/pmap.c	Sun May 22 20:19:01 2011	(r222193)
+++ projects/largeSMP/sys/i386/xen/pmap.c	Sun May 22 20:24:36 2011	(r222194)
@@ -1730,6 +1730,7 @@ pmap_lazyfix(pmap_t pmap)
 
 		/* Find least significant set bit. */
 		lsb = cpusetobj_ffs(&mask);
+		MPASS(lsb != 0);
 		lsb--;
 		CPU_SETOF(lsb, &mask);
 		mtx_lock_spin(&smp_ipi_mtx);