From owner-svn-src-all@FreeBSD.ORG Tue Jun 10 09:33:58 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA16F89A; Tue, 10 Jun 2014 09:33:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B42B72E67; Tue, 10 Jun 2014 09:33:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5A9XweH090071; Tue, 10 Jun 2014 09:33:58 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5A9XwW3090070; Tue, 10 Jun 2014 09:33:58 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201406100933.s5A9XwW3090070@svn.freebsd.org> From: Marius Strobl Date: Tue, 10 Jun 2014 09:33:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267322 - stable/9/sys/i386/conf X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jun 2014 09:33:58 -0000 Author: marius Date: Tue Jun 10 09:33:58 2014 New Revision: 267322 URL: http://svnweb.freebsd.org/changeset/base/267322 Log: MFC: r266821 (partial) - Actually, modules are built correctly when compiled along the kernel as they then pick up an opt_global.h from KERNBUILDDIR having PAE defined. Thus, build all modules by default except those which still really are defective as of r267058. - Minor style cleanup. Approved by: re (glebius) Modified: stable/9/sys/i386/conf/PAE Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/i386/conf/PAE ============================================================================== --- stable/9/sys/i386/conf/PAE Tue Jun 10 08:20:00 2014 (r267321) +++ stable/9/sys/i386/conf/PAE Tue Jun 10 09:33:58 2014 (r267322) @@ -10,9 +10,8 @@ ident PAE-GENERIC # To make a PAE kernel, the next option is needed options PAE # Physical Address Extensions Kernel -# Don't build modules with this kernel config, since they are not built with -# the correct options headers. -makeoptions NO_MODULES=yes +# The following modules don't build with PAE enabled. +makeoptions WITHOUT_MODULES="ctl dpt hptmv ida malo mwl" # force isp firmware to fully loaded device ispfw @@ -23,7 +22,6 @@ device ispfw # address properly may cause data corruption when used in a machine with more # than 4 gigabytes of memory. - nodevice ahb nodevice amd nodevice sym