Author: imp
Date: Sun Jan 10 17:44:22 2010
New Revision: 202019
URL: http://svn.freebsd.org/changeset/base/202019

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

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/i386/conf/GENERIC
  head/sys/ia64/conf/GENERIC
  head/sys/pc98/conf/GENERIC
  head/sys/powerpc/conf/GENERIC
  head/sys/sparc64/conf/GENERIC
  head/sys/sun4v/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sun Jan 10 17:15:36 2010        (r202018)
+++ head/sys/amd64/conf/GENERIC Sun Jan 10 17:44:22 2010        (r202019)
@@ -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
 
 # Debugging for use in -current
 options        KDB                     # Enable kernel debugger support.

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Sun Jan 10 17:15:36 2010        (r202018)
+++ head/sys/i386/conf/GENERIC  Sun Jan 10 17:44:22 2010        (r202019)
@@ -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
 
 # Debugging for use in -current
 options        KDB                     # Enable kernel debugger support.

Modified: head/sys/ia64/conf/GENERIC
==============================================================================
--- head/sys/ia64/conf/GENERIC  Sun Jan 10 17:15:36 2010        (r202018)
+++ head/sys/ia64/conf/GENERIC  Sun Jan 10 17:44:22 2010        (r202019)
@@ -67,6 +67,7 @@ options       WITNESS         # Enable checks to det
 options        WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
 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: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC  Sun Jan 10 17:15:36 2010        (r202018)
+++ head/sys/pc98/conf/GENERIC  Sun Jan 10 17:44:22 2010        (r202019)
@@ -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
 
 # Debugging for use in -current
 options        KDB                     # Enable kernel debugger support.

Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC       Sun Jan 10 17:15:36 2010        
(r202018)
+++ head/sys/powerpc/conf/GENERIC       Sun Jan 10 17:44:22 2010        
(r202019)
@@ -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
 
 # Debugging for use in -current
 options        KDB                     #Enable the kernel debugger

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC       Sun Jan 10 17:15:36 2010        
(r202018)
+++ head/sys/sparc64/conf/GENERIC       Sun Jan 10 17:44:22 2010        
(r202019)
@@ -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
 
 # Debugging for use in -current
 options        KDB                     # Enable kernel debugger support.

Modified: head/sys/sun4v/conf/GENERIC
==============================================================================
--- head/sys/sun4v/conf/GENERIC Sun Jan 10 17:15:36 2010        (r202018)
+++ head/sys/sun4v/conf/GENERIC Sun Jan 10 17:44:22 2010        (r202019)
@@ -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
-
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to