svn commit: r202536 - in stable/8/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf

[Warner Losh]

Author: imp
Date: Mon Jan 18 00:53:21 2010
New Revision: 202536
URL: http://svn.freebsd.org/changeset/base/202536

Log:
  MFC r202019:
    Add INCLUDE_CONFIG_FILE in GENERIC on all non-embedded platforms.
    # This is the resolution of removing it from DEFAULTS...

Modified:
  stable/8/sys/amd64/conf/GENERIC
  stable/8/sys/i386/conf/GENERIC
  stable/8/sys/ia64/conf/GENERIC
  stable/8/sys/pc98/conf/GENERIC
  stable/8/sys/powerpc/conf/GENERIC
  stable/8/sys/sparc64/conf/GENERIC
  stable/8/sys/sun4v/conf/GENERIC
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/amd64/conf/GENERIC
==============================================================================
--- stable/8/sys/amd64/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/amd64/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -75,6 +75,7 @@ options 	MAC			# TrustedBSD MAC Framewor
 options		FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/8/sys/i386/conf/GENERIC
==============================================================================
--- stable/8/sys/i386/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/i386/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -75,6 +75,7 @@ options 	AUDIT			# Security event auditi
 options 	MAC			# TrustedBSD MAC Framework
 options		FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # To make an SMP kernel, the next two lines are needed
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/8/sys/ia64/conf/GENERIC
==============================================================================
--- stable/8/sys/ia64/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/ia64/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -62,6 +62,7 @@ options 	UFS_DIRHASH	# Hash-based direct
 options 	UFS_GJOURNAL	# Enable gjournal-based UFS journaling
 options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
 options 	HWPMC_HOOKS	# Necessary kernel hooks for hwpmc(4)
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Various "busses"
 device		firewire	# FireWire bus code

Modified: stable/8/sys/pc98/conf/GENERIC
==============================================================================
--- stable/8/sys/pc98/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/pc98/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -75,6 +75,7 @@ options 	KBD_INSTALL_CDEV	# install a CD
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # To make an SMP kernel, the next two lines are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/8/sys/powerpc/conf/GENERIC
==============================================================================
--- stable/8/sys/powerpc/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/powerpc/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -66,6 +66,7 @@ options 	_KPOSIX_PRIORITY_SCHEDULING #Po
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # To make an SMP kernel, the next line is needed
 #options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/8/sys/sparc64/conf/GENERIC
==============================================================================
--- stable/8/sys/sparc64/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/sparc64/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -72,6 +72,7 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: stable/8/sys/sun4v/conf/GENERIC
==============================================================================
--- stable/8/sys/sun4v/conf/GENERIC	Mon Jan 18 00:43:33 2010	(r202535)
+++ stable/8/sys/sun4v/conf/GENERIC	Mon Jan 18 00:53:21 2010	(r202536)
@@ -66,6 +66,7 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 # Debugging for use in -current
 options 	KDB			# Enable kernel debugger support.
@@ -219,4 +220,3 @@ device		ccd
 # on most arches and in most cases 1000Hz pessimizes performance
 # its choice was not adequately researched
 options 	HZ=100
-