head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.4.2.1.4.2
	RELENG_9_1:1.4.2.1.0.4
	RELENG_9_1_BP:1.4.2.1
	RELENG_8_3_0_RELEASE:1.2.2.3.6.1
	RELENG_8_3:1.2.2.3.0.6
	RELENG_8_3_BP:1.2.2.3
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_8_2_0_RELEASE:1.2.2.3.4.1
	RELENG_8_2:1.2.2.3.0.4
	RELENG_8_2_BP:1.2.2.3
	RELENG_8_1_0_RELEASE:1.2.2.3.2.1
	RELENG_8_1:1.2.2.3.0.2
	RELENG_8_1_BP:1.2.2.3
	RELENG_8_0_0_RELEASE:1.2.2.1.2.1
	RELENG_8_0:1.2.2.1.0.2
	RELENG_8_0_BP:1.2.2.1
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.51.09;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2012.08.18.05.48.19;	author andrew;	state Exp;
branches;
next	1.6;

1.6
date	2012.03.06.20.01.25;	author attilio;	state Exp;
branches;
next	1.5;

1.5
date	2011.11.08.10.18.07;	author attilio;	state Exp;
branches;
next	1.4;

1.4
date	2010.01.04.21.30.04;	author imp;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2009.12.16.02.17.43;	author dougb;	state Exp;
branches;
next	1.2;

1.2
date	2008.12.17.17.43.22;	author marcel;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2008.10.23.01.51.55;	author marcel;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.51.09;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.03.58;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

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

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.36.44;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.1.4.2;

1.4.2.1.4.2
date	2012.11.17.08.47.34;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2009.12.29.05.35.25;	author dougb;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2010.01.04.21.33.10;	author imp;	state Exp;
branches
	1.2.2.3.2.1
	1.2.2.3.4.1
	1.2.2.3.6.1;
next	1.2.2.4;

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

1.2.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.2.3.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.2.3.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.2.3.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.2.3.6.2;

1.2.2.3.6.2
date	2012.11.17.08.25.06;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@#
# DEFAULTS -- Default kernel configuration file for FreeBSD/arm
#
# $FreeBSD: head/sys/arm/conf/DEFAULTS 239362 2012-08-18 05:48:19Z andrew $

device		mem

options 	GEOM_PART_BSD
options 	GEOM_PART_MBR
@


1.8.2.1
log
@file DEFAULTS was added on branch RELENG_8_4 on 2013-03-28 13:03:58 +0000
@
text
@d1 9
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 11
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/arm
#
# $FreeBSD: releng/8.4/sys/arm/conf/DEFAULTS 201535 2010-01-04 21:33:10Z imp $

machine 	arm

device		mem

options 	GEOM_PART_BSD
options 	GEOM_PART_MBR
@


1.7
log
@SVN rev 239362 on 2012-08-18 05:48:19Z by andrew

Set machine correctly on ARM. This allows universe to use the correct world
when building each kernel.

Reviewed by:	imp
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.6
log
@SVN rev 232619 on 2012-03-06 20:01:25Z by attilio

Disable the option VFS_ALLOW_NONMPSAFE by default on all the supported
platforms.
This will make every attempt to mount a non-mpsafe filesystem to the
kernel forbidden, unless it is expressely compiled with
VFS_ALLOW_NONMPSAFE option.

This patch is part of the effort of killing non-MPSAFE filesystems
from the tree.

No MFC is expected for this patch.
@
text
@a5 2
machine 	arm

@


1.5
log
@SVN rev 227333 on 2011-11-08 10:18:07Z by attilio

Introduce the option VFS_ALLOW_NONMPSAFE and turn it on by default on
all the architectures.
The option allows to mount non-MPSAFE filesystem. Without it, the
kernel will refuse to mount a non-MPSAFE filesytem.

This patch is part of the effort of killing non-MPSAFE filesystems
from the tree.

No MFC is expected for this patch.

Tested by:	gianni
Reviewed by:	kib
@
text
@a11 2

options		VFS_ALLOW_NONMPSAFE
@


1.4
log
@SVN rev 201534 on 2010-01-04 21:30:04Z by imp

Revert 200594.  This file isn't intended for these sorts of things.
@
text
@d12 2
@


1.4.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.2
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/arm/conf/DEFAULTS 201534 2010-01-04 21:30:04Z imp $
@


1.4.2.1.4.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.4.2.1.4.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.1/sys/arm/conf/DEFAULTS 201534 2010-01-04 21:30:04Z imp $
@


1.4.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.0/sys/arm/conf/DEFAULTS 201534 2010-01-04 21:30:04Z imp $
@


1.3
log
@SVN rev 200594 on 2009-12-16 02:17:43Z by dougb

Add INCLUDE_CONFIG_FILE, and a note in comments about how to also
include the comments with CONFIGARGS
@
text
@a11 7
 
# Store the plain version of the configuration file in the kernel itself.
# To store the entire file, including comments, put this in /etc/src.conf:
# CONFIGARGS=	-C
# See config(8) for more details.
#
options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
@


1.2
log
@SVN rev 186240 on 2008-12-17 17:43:22Z by marcel

Make gpart the default partitioning class on all platforms.
Both ia64 and powerpc were using gpart exclusively already
so there's no change for those two.

Discussed on: arch@@
@
text
@d12 7
@


1.2.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.2.2
log
@SVN rev 201158 on 2009-12-29 05:35:25Z by dougb

MFC r200594:

Add INCLUDE_CONFIG_FILE, and a note in comments about how to also
include the comments with CONFIGARGS
@
text
@a11 7
 
# Store the plain version of the configuration file in the kernel itself.
# To store the entire file, including comments, put this in /etc/src.conf:
# CONFIGARGS=	-C
# See config(8) for more details.
#
options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
@


1.2.2.3
log
@SVN rev 201535 on 2010-01-04 21:33:10Z by imp

Revert 201158.  DEFAULTS isn't for this kind of thing.a
@
text
@d12 7
@


1.2.2.4
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/arm/conf/DEFAULTS 201535 2010-01-04 21:33:10Z imp $
@


1.2.2.3.6.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.2.3.6.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/8.3/sys/arm/conf/DEFAULTS 201535 2010-01-04 21:33:10Z imp $
@


1.2.2.3.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.3.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1
log
@SVN rev 184193 on 2008-10-23 01:51:55Z by marcel

Add arm/conf/DEFAULTS and populate it with:
        machine arm
        device  mem
        options GEOM_BSD
        options GEOM_MBR

Remove the first two from all kernel configuration files and
change geom_bsd and geom_mbr from standard to optional.
@
text
@d10 2
a11 2
options 	GEOM_BSD
options 	GEOM_MBR
@

