From owner-svn-src-all@FreeBSD.ORG Tue Jun 10 09:36:11 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 7854DA1B; Tue, 10 Jun 2014 09:36:11 +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 648922E81; Tue, 10 Jun 2014 09:36:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5A9aBJ1090452; Tue, 10 Jun 2014 09:36:11 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5A9aBHr090451; Tue, 10 Jun 2014 09:36:11 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201406100936.s5A9aBHr090451@svn.freebsd.org> From: Marius Strobl Date: Tue, 10 Jun 2014 09:36:11 +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: r267323 - 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:36:11 -0000 Author: marius Date: Tue Jun 10 09:36:10 2014 New Revision: 267323 URL: http://svnweb.freebsd.org/changeset/base/267323 Log: MFC: r266820 (partial) - Shrink the list of excluded modules to what actually still doesn't build as of r267058. - Some style cleanups. Approved by: re (glebius) Modified: stable/9/sys/i386/conf/XEN Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/i386/conf/XEN ============================================================================== --- stable/9/sys/i386/conf/XEN Tue Jun 10 09:33:58 2014 (r267322) +++ stable/9/sys/i386/conf/XEN Tue Jun 10 09:36:10 2014 (r267323) @@ -7,11 +7,12 @@ cpu I686_CPU ident XEN makeoptions DEBUG=-gdwarf-2 # Build kernel with gdb(1) debug symbols -makeoptions WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mpr mps mwl nve rdma sound sym trm xfs" + +# The following modules don't build with PAE and XEN enabled. +makeoptions WITHOUT_MODULES="ctl dpt drm drm2 hptmv ida malo mwl rdma xfs" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption -#options SCHED_4BSD options INET # InterNETworking options INET6 # IPv6 communications protocols @@ -65,7 +66,6 @@ options MCLSHIFT=12 options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC - #device atkbdc # AT keyboard controller #device atkbd # AT keyboard device psm # PS/2 mouse @@ -87,4 +87,3 @@ device faith # IPv6-to-IPv4 relaying ( # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter -