From owner-svn-src-all@FreeBSD.ORG  Mon Jan 16 02:42:17 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 42015106566B;
	Mon, 16 Jan 2012 02:42:17 +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 2CA888FC0C;
	Mon, 16 Jan 2012 02:42:17 +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 q0G2gHGi011543;
	Mon, 16 Jan 2012 02:42:17 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0G2gGxX011542;
	Mon, 16 Jan 2012 02:42:16 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201201160242.q0G2gGxX011542@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 16 Jan 2012 02:42:16 +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: r230184 - head/sys/i386/conf
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:42:17 -0000

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

Log:
  Copy XENHVM config file from amd64, now that i386+XENHVM works.

Added:
     - copied unchanged from r230183, head/sys/amd64/conf/XENHVM
Directory Properties:
  head/sys/i386/conf/XENHVM   (props changed)

Copied: head/sys/i386/conf/XENHVM (from r230183, head/sys/amd64/conf/XENHVM)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/i386/conf/XENHVM	Mon Jan 16 02:42:16 2012	(r230184, copy of r230183, head/sys/amd64/conf/XENHVM)
@@ -0,0 +1,24 @@
+#
+# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64
+#
+# $FreeBSD$
+#
+include		GENERIC
+ident		XENHVM
+
+makeoptions	MODULES_OVERRIDE=""
+
+#
+# Adaptive locks rely on a lock-free pointer read to determine the run state
+# of the thread holding a lock when under contention; under a virtualisation
+# system, the thread run state may not accurately reflect whether the thread
+# (or rather its host VCPU) is actually executing.  As such, disable this
+# optimisation.
+#
+options 	NO_ADAPTIVE_MUTEXES
+options 	NO_ADAPTIVE_RWLOCKS
+options 	NO_ADAPTIVE_SX
+
+# Xen HVM support
+options 	XENHVM
+device		xenpci