Author: marius
Date: Mon Dec 29 20:33:34 2014
New Revision: 276377
URL: https://svnweb.freebsd.org/changeset/base/276377

Log:
  - No longer exclude malo(4) and mwl(4), they have been fixed in r275870
    and r275871 respectively to build with PAE enabled.
  - For the PAE kernel configuration file, no longer exclude devices that
    are known to be 64-bit DMA clean from amd64.
  
  MFC after:    3 days

Modified:
  head/sys/i386/conf/PAE
  head/sys/i386/conf/XEN

Modified: head/sys/i386/conf/PAE
==============================================================================
--- head/sys/i386/conf/PAE      Mon Dec 29 20:31:26 2014        (r276376)
+++ head/sys/i386/conf/PAE      Mon Dec 29 20:33:34 2014        (r276377)
@@ -10,73 +10,14 @@ ident               PAE-GENERIC
 # To make a PAE kernel, the next option is needed
 options        PAE                     # Physical Address Extensions Kernel
 
-# The following modules don't build with PAE enabled.
-makeoptions    WITHOUT_MODULES="ctl dpt hptmv ida malo mwl"
-
-# What follows is a list of drivers that are normally in GENERIC, but either
-# don't work or are untested with PAE.  Be very careful before enabling any
-# of these drivers.  Drivers which use DMA and don't handle 64 bit physical
-# address properly may cause data corruption when used in a machine with more
-# than 4 gigabytes of memory.
-
-nodevice       ahb
-nodevice       sym
-nodevice       trm
-
-nodevice       adv
-nodevice       adw
-nodevice       aha
-nodevice       aic
-nodevice       bt
-
-nodevice       ncv
-nodevice       nsp
-nodevice       stg
-
-nodevice       asr
+# The following drivers don't build with PAE enabled.
+makeoptions    WITHOUT_MODULES="ctl dpt hptmv ida"
 nodevice       dpt
-nodevice       mly
 nodevice       hptmv
-nodevice       hptnr
-nodevice       hptrr
-
 nodevice       ida
-nodevice       mlx
-nodevice       pst
-
-nodevice       agp
-
-nodevice       txp
-nodevice       vx
-
-nodevice       pcn
-nodevice       sf
-nodevice       sis
-nodevice       ste
-nodevice       tl
-nodevice       tx
-nodevice       vr
-nodevice       wb
 
-nodevice       cs
-nodevice       ed
-nodevice       ex
-nodevice       ep
-nodevice       fe
-nodevice       ie
-nodevice       sn
-nodevice       xe
-
-nodevice       an
-nodevice       ath             # Atheros pci/cardbus NICs
-nodevice       ath_pci
-nodevice       ath_hal
-nodevice       ath_rate_sample # SampleRate tx rate control for ath
-nodevice       ipw
-nodevice       iwi
-nodevice       iwn
-nodevice       malo
-nodevice       mwl
-nodevice       ral
-nodevice       wi
-nodevice       wpi
+# The following drivers don't work with PAE enabled.
+makeoptions    WITHOUT_MODULES+="asr ncr pst"
+nodevice       asr
+nodevice       ncr
+nodevice       pst

Modified: head/sys/i386/conf/XEN
==============================================================================
--- head/sys/i386/conf/XEN      Mon Dec 29 20:31:26 2014        (r276376)
+++ head/sys/i386/conf/XEN      Mon Dec 29 20:33:34 2014        (r276377)
@@ -9,7 +9,7 @@ ident           XEN
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
 
 # The following modules don't build with PAE and XEN enabled.
-makeoptions    WITHOUT_MODULES="ctl dpt drm drm2 hptmv ida malo mwl"
+makeoptions    WITHOUT_MODULES="ctl dpt drm drm2 hptmv ida"
 
 options        SCHED_ULE               # ULE scheduler
 options        PREEMPTION              # Enable kernel thread preemption
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to