From owner-svn-src-all@FreeBSD.ORG  Mon Jan 16 02:38:45 2012
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 E5E7C1065670;
	Mon, 16 Jan 2012 02:38:45 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D06508FC08;
	Mon, 16 Jan 2012 02:38:45 +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 q0G2cjfT011389;
	Mon, 16 Jan 2012 02:38:45 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0G2cjie011387;
	Mon, 16 Jan 2012 02:38:45 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201201160238.q0G2cjie011387@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 16 Jan 2012 02:38:45 +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: r230183 - head/sys/dev/xen/xenpci
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, 16 Jan 2012 02:38:46 -0000

Author: cperciva
Date: Mon Jan 16 02:38:45 2012
New Revision: 230183
URL: http://svn.freebsd.org/changeset/base/230183

Log:
  Make XENHVM work on i386.  The __ffs() function counts bits starting from
  zero, unlike ffs(3), which starts counting from 1.

Modified:
  head/sys/dev/xen/xenpci/evtchn.c

Modified: head/sys/dev/xen/xenpci/evtchn.c
==============================================================================
--- head/sys/dev/xen/xenpci/evtchn.c	Mon Jan 16 01:14:07 2012	(r230182)
+++ head/sys/dev/xen/xenpci/evtchn.c	Mon Jan 16 02:38:45 2012	(r230183)
@@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/xen/xenpci/xenpcivar.h>
 
 #if defined(__i386__)
-#define	__ffs(word)	ffs(word)
+#define	__ffs(word)	(ffs(word) - 1)
 #elif defined(__amd64__)
 static inline unsigned long __ffs(unsigned long word)
 {