From ff8215a63a6e3b0f9aec76453c0acf82c6d4ba0a Mon Sep 17 00:00:00 2001
From: marius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 8 Feb 2015 23:09:01 +0000
Subject: [PATCH] MFC: r276377, r276714

- No longer exclude malo(4) and mwl(4), they have been fixed in r275870
  (MFCed to stable/10 in r278415) and r275871 (MFCed to stable/10 in
  r278416) 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.


git-svn-id: svn://svn.freebsd.org/base/stable/10@278424 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/i386/conf/PAE | 77 +++++------------------------------------------
 sys/i386/conf/XEN |  7 +++--
 2 files changed, 12 insertions(+), 72 deletions(-)

diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index 858d8166d..d8078cd0c 100644
--- a/sys/i386/conf/PAE
+++ b/sys/i386/conf/PAE
@@ -10,77 +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"
-
-# force isp firmware to fully loaded
-device		ispfw
-
-# 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	nve
-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
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN
index 2fac5d6bb..c9fdab044 100644
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -8,8 +8,11 @@ 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 cxgb dpt drm drm2 hptmv ida malo mwl rdma"
+# The following drivers don't build with PAE or XEN enabled.
+makeoptions	WITHOUT_MODULES="ctl cxgb dpt drm drm2 hptmv ida rdma"
+
+# The following drivers don't work with PAE enabled.
+makeoptions	WITHOUT_MODULES+="asr ncr pst"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
-- 
2.45.0