From owner-svn-src-stable-7@FreeBSD.ORG Mon Jan 18 04:08:43 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F229106566C; Mon, 18 Jan 2010 04:08:43 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8BD2D8FC12; Mon, 18 Jan 2010 04:08:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0I48h6i043324; Mon, 18 Jan 2010 04:08:43 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0I48hID043316; Mon, 18 Jan 2010 04:08:43 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201001180408.o0I48hID043316@svn.freebsd.org> From: Warner Losh Date: Mon, 18 Jan 2010 04:08:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202547 - in stable/7/sys: amd64/conf i386/conf ia64/conf pc98/conf powerpc/conf sparc64/conf sun4v/conf X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2010 04:08:43 -0000 Author: imp Date: Mon Jan 18 04:08:43 2010 New Revision: 202547 URL: http://svn.freebsd.org/changeset/base/202547 Log: MFC 202019: Add INCLUDE_CONFIG_FILE in GENERIC on all non-embedded platforms. # This is the resolution of removing it from DEFAULTS... Modified: stable/7/sys/amd64/conf/GENERIC stable/7/sys/i386/conf/GENERIC stable/7/sys/ia64/conf/GENERIC stable/7/sys/pc98/conf/GENERIC stable/7/sys/powerpc/conf/GENERIC stable/7/sys/sparc64/conf/GENERIC stable/7/sys/sun4v/conf/GENERIC Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/amd64/conf/GENERIC ============================================================================== --- stable/7/sys/amd64/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/amd64/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -66,6 +66,7 @@ options STOP_NMI # Stop CPUS using NMI options AUDIT # Security event auditing #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/7/sys/i386/conf/GENERIC ============================================================================== --- stable/7/sys/i386/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/i386/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -66,6 +66,7 @@ options ADAPTIVE_GIANT # Giant mutex i options STOP_NMI # Stop CPUS using NMI instead of IPI options AUDIT # Security event auditing #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/7/sys/ia64/conf/GENERIC ============================================================================== --- stable/7/sys/ia64/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/ia64/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -60,6 +60,7 @@ options UFS_ACL # Support for access c options UFS_DIRHASH # Hash-based directory lookup scheme options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B RT extensions options AUDIT # Security event auditing +options INCLUDE_CONFIG_FILE # Include this file in kernel # Various "busses" device firewire # FireWire bus code Modified: stable/7/sys/pc98/conf/GENERIC ============================================================================== --- stable/7/sys/pc98/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/pc98/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -66,6 +66,7 @@ options P1003_1B_SEMAPHORES # POSIX-sty options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options AUDIT # Security event auditing +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/7/sys/powerpc/conf/GENERIC ============================================================================== --- stable/7/sys/powerpc/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/powerpc/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -63,6 +63,7 @@ options SYSVSEM #SYSV-style semaphore options P1003_1B_SEMAPHORES # POSIX-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options AUDIT # Security event auditing +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/7/sys/sparc64/conf/GENERIC ============================================================================== --- stable/7/sys/sparc64/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/sparc64/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -65,6 +65,7 @@ options P1003_1B_SEMAPHORES # POSIX-sty options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options ADAPTIVE_GIANT # Giant mutex is adaptive. options AUDIT # Security event auditing +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/7/sys/sun4v/conf/GENERIC ============================================================================== --- stable/7/sys/sun4v/conf/GENERIC Mon Jan 18 03:58:23 2010 (r202546) +++ stable/7/sys/sun4v/conf/GENERIC Mon Jan 18 04:08:43 2010 (r202547) @@ -67,6 +67,7 @@ options AHC_REG_PRETTY_PRINT # Print re options ADAPTIVE_GIANT # Giant mutex is adaptive. options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options AUDIT # Security event auditing +options INCLUDE_CONFIG_FILE # Include this file in kernel # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel @@ -210,4 +211,3 @@ device ccd # on most arches and in most cases 1000Hz pessimizes performance # its choice was not adequately researched options HZ=100 -