From owner-p4-projects@FreeBSD.ORG  Wed Nov  5 17:42:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7431816A4D0; Wed,  5 Nov 2003 17:42:48 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 085C416A4CE
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 17:42:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 46CC843FBF
	for <perforce@freebsd.org>; Wed,  5 Nov 2003 17:42:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA61glXJ072543
	for <perforce@freebsd.org>; Wed, 5 Nov 2003 17:42:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA61gkLY072540
	for perforce@freebsd.org; Wed, 5 Nov 2003 17:42:46 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Wed, 5 Nov 2003 17:42:46 -0800 (PST)
Message-Id: <200311060142.hA61gkLY072540@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41515 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2003 01:42:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=41515

Change 41515 by peter@peter_daintree on 2003/11/05 17:42:24

	sync with vendor branch (mismerge)

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#22 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#22 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.220 2003/11/03 22:32:03 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.221 2003/11/06 01:24:25 peter Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -744,6 +744,12 @@
  * -mcpu=pentiumpro and -march=pentiumpro then gcc-3.1 will use
  * an imull, and in that case it is faster.  In most other cases
  * it appears slightly slower.
+ *
+ * Another variant (also from fortune):
+ * #define BITCOUNT(x) (((BX_(x)+(BX_(x)>>4)) & 0x0F0F0F0F) % 255)
+ * #define  BX_(x)     ((x) - (((x)>>1)&0x77777777)            \
+ *                          - (((x)>>2)&0x33333333)            \
+ *                          - (((x)>>3)&0x11111111))
  */
 static __inline u_int32_t
 popcnt(u_int32_t m)