o Move options IOMMU from Debugging section back to the Bus section

where it originally was. The bug introduced in r366267.
o Remove options IOMMU from i386/MINIMAL as we don't have it in
  i386/GENERIC.

Reported by:	Harry Schmalzbauer <freebsd@omnilan.de>
Reviewed by:	kib
Sponsored by:	Innovate DSbD
Differential Revision:	https://reviews.freebsd.org/D27399
This commit is contained in:
Ruslan Bukin 2020-11-27 21:37:48 +00:00
parent 0c56925bc2
commit f120ad6ba0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=368113
3 changed files with 2 additions and 3 deletions

View File

@ -102,7 +102,6 @@ options WITNESS # Enable checks to detect deadlocks and cycles
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 @@ device cpufreq
# Bus support.
device acpi
options IOMMU
device pci
options PCI_HP # PCI-Express native HotPlug
options PCI_IOV # PCI SR-IOV support

View File

@ -93,7 +93,6 @@ options WITNESS # Enable checks to detect deadlocks and cycles
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 @@ device cpufreq
# Bus support.
device acpi
options IOMMU
device pci
# atkbdc0 controls both the keyboard and the PS/2 mouse

View File

@ -93,7 +93,6 @@ options WITNESS # Enable checks to detect deadlocks and cycles
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