From owner-svn-src-user@FreeBSD.ORG  Thu May 27 00:09:09 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AF691065673;
	Thu, 27 May 2010 00:09:09 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A9258FC16;
	Thu, 27 May 2010 00:09:09 +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 o4R099uA099308;
	Thu, 27 May 2010 00:09:09 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4R099vZ099306;
	Thu, 27 May 2010 00:09:09 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201005270009.o4R099vZ099306@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 27 May 2010 00:09:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208584 - user/jmallett/octeon/sys/mips/cavium
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 May 2010 00:09:09 -0000

Author: jmallett
Date: Thu May 27 00:09:09 2010
New Revision: 208584
URL: http://svn.freebsd.org/changeset/base/208584

Log:
  Make a trivial allowance for gaps in the coremask.  (We certainly do not handle
  not running on core 0, at the very least.)

Modified:
  user/jmallett/octeon/sys/mips/cavium/octeon_mp.c

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_mp.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Thu May 27 00:07:50 2010	(r208583)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_mp.c	Thu May 27 00:09:09 2010	(r208584)
@@ -94,7 +94,7 @@ platform_init_ap(int cpuid)
 int
 platform_num_processors(void)
 {
-	return (fls(octeon_bootinfo->core_mask));
+	return (bitcount32(octeon_bootinfo->core_mask));
 }
 
 struct cpu_group *