Index: head/sys/amd64/conf/GENERIC
===================================================================
--- head/sys/amd64/conf/GENERIC
+++ head/sys/amd64/conf/GENERIC
@@ -102,7 +102,6 @@
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
-options 	IOMMU
 
 # Kernel Sanitizers
 #options 	COVERAGE		# Generic kernel coverage. Used by KCOV
@@ -128,6 +127,7 @@
 
 # Bus support.
 device		acpi
+options 	IOMMU
 device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
 options		PCI_IOV			# PCI SR-IOV support
Index: head/sys/amd64/conf/MINIMAL
===================================================================
--- head/sys/amd64/conf/MINIMAL
+++ head/sys/amd64/conf/MINIMAL
@@ -93,7 +93,6 @@
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
-options 	IOMMU
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel
@@ -104,6 +103,7 @@
 
 # Bus support.
 device		acpi
+options 	IOMMU
 device		pci
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
Index: head/sys/i386/conf/MINIMAL
===================================================================
--- head/sys/i386/conf/MINIMAL
+++ head/sys/i386/conf/MINIMAL
@@ -93,7 +93,6 @@
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
 options 	VERBOSE_SYSINIT=0	# Support debug.verbose_sysinit, off by default
-options 	IOMMU
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel