head	1.4;
access;
symbols
	RELENG_8_4:1.4.0.2
	RELENG_9_1_0_RELEASE:1.2.2.2.2.3
	RELENG_9_1:1.2.2.2.0.2
	RELENG_9_1_BP:1.2.2.2
	RELENG_8_3_0_RELEASE:1.2.4.2.2.1
	RELENG_8_3:1.2.4.2.0.2
	RELENG_8_3_BP:1.2.4.2
	RELENG_8:1.2.0.4
	RELENG_9:1.2.0.2;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.52.34;	author svnexp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2012.08.13.07.36.57;	author cperciva;	state Exp;
branches;
next	1.2;

1.2
date	2012.01.16.02.42.41;	author cperciva;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2012.01.16.02.42.16;	author cperciva;	state Exp;
branches;
next	;

1.4.2.1
date	2012.11.17.01.52.34;	author svnexp;	state dead;
branches;
next	1.4.2.2;

1.4.2.2
date	2013.03.28.13.05.06;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2012.02.23.19.49.25;	author cperciva;	state dead;
branches;
next	1.2.2.2;

1.2.2.2
date	2012.02.23.19.49.25;	author cperciva;	state Exp;
branches
	1.2.2.2.2.1;
next	1.2.2.3;

1.2.2.3
date	2012.08.20.11.34.49;	author cperciva;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2012.11.17.11.37.11;	author svnexp;	state Exp;
branches;
next	;

1.2.2.2.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.2.2.2;

1.2.2.2.2.2
date	2012.08.24.05.36.37;	author cperciva;	state Exp;
branches;
next	1.2.2.2.2.3;

1.2.2.2.2.3
date	2012.11.17.08.47.58;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1
date	2012.02.24.15.34.36;	author cperciva;	state dead;
branches;
next	1.2.4.2;

1.2.4.2
date	2012.02.24.15.34.36;	author cperciva;	state Exp;
branches
	1.2.4.2.2.1;
next	1.2.4.3;

1.2.4.3
date	2012.11.17.10.36.50;	author svnexp;	state Exp;
branches;
next	;

1.2.4.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.4.2.2.2;

1.2.4.2.2.2
date	2012.11.17.08.25.27;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@#
# XENHVM -- Xen HVM kernel configuration file for FreeBSD/i386
#
# $FreeBSD: head/sys/i386/conf/XENHVM 239228 2012-08-13 07:36:57Z cperciva $
#
include		GENERIC
ident		XENHVM

#
# 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
@


1.4.2.1
log
@file XENHVM was added on branch RELENG_8_4 on 2013-03-28 13:05:06 +0000
@
text
@d1 22
@


1.4.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 24
#
# XENHVM -- Xen HVM kernel configuration file for FreeBSD/i386
#
# $FreeBSD: releng/8.4/sys/i386/conf/XENHVM 235630 2012-05-18 20:43:48Z jhb $
#
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
@


1.3
log
@SVN rev 239228 on 2012-08-13 07:36:57Z by cperciva

Build modules along with the XENHVM kernels.

No objections from:	freebsd-xen mailing list
MFC after:	1 week
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.2
log
@SVN rev 230185 on 2012-01-16 02:42:41Z by cperciva

s/amd64/i386/ in comment.
@
text
@a8 2
makeoptions	MODULES_OVERRIDE=""

@


1.2.4.1
log
@file XENHVM was added on branch RELENG_8 on 2012-02-24 15:34:56 +0000
@
text
@d1 24
@


1.2.4.2
log
@SVN rev 232115 on 2012-02-24 15:34:36Z by cperciva

MFC 230184, 230185: Add XENHVM config file to i386

Approved by:	re (kib)
@
text
@a0 24
#
# XENHVM -- Xen HVM kernel configuration file for FreeBSD/i386
#
# $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
@


1.2.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d4 1
a4 1
# $FreeBSD: stable/8/sys/i386/conf/XENHVM 235630 2012-05-18 20:43:48Z jhb $
@


1.2.4.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.2.2.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/8.3/sys/i386/conf/XENHVM 233955 2012-04-06 17:21:31Z marius $
@


1.2.2.1
log
@file XENHVM was added on branch RELENG_9 on 2012-02-23 19:49:36 +0000
@
text
@d1 24
@


1.2.2.2
log
@SVN rev 232067 on 2012-02-23 19:49:25Z by cperciva

MFC 230184, 230185: Add XENHVM config file to i386.
@
text
@a0 24
#
# XENHVM -- Xen HVM kernel configuration file for FreeBSD/i386
#
# $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
@


1.2.2.2.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.2.2.2.2.2
log
@SVN rev 239639 on 2012-08-24 05:36:37Z by cperciva

MFC r239228: Build modules along with the XENHVM kernels.

Approved by:	re (kib)
@
text
@d9 2
@


1.2.2.2.2.3
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.1/sys/i386/conf/XENHVM 239639 2012-08-24 05:36:37Z cperciva $
@


1.2.2.3
log
@SVN rev 239412 on 2012-08-20 11:34:49Z by cperciva

MFC r239228: Build modules along with the XENHVM kernels.
@
text
@d9 2
@


1.2.2.4
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d4 1
a4 1
# $FreeBSD: stable/9/sys/i386/conf/XENHVM 239412 2012-08-20 11:34:49Z cperciva $
@


1.1
log
@SVN rev 230184 on 2012-01-16 02:42:16Z by cperciva

Copy XENHVM config file from amd64, now that i386+XENHVM works.
@
text
@d2 1
a2 1
# XENHVM -- Xen HVM kernel configuration file for FreeBSD/amd64
@

