Date: Fri, 27 Nov 2020 21:37:48 +0000 (UTC) From: Ruslan Bukin <br@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368113 - in head/sys: amd64/conf i386/conf Message-ID: <202011272137.0ARLbmNN060116@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: br Date: Fri Nov 27 21:37:48 2020 New Revision: 368113 URL: https://svnweb.freebsd.org/changeset/base/368113 Log: 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 Modified: head/sys/amd64/conf/GENERIC head/sys/amd64/conf/MINIMAL head/sys/i386/conf/MINIMAL Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Fri Nov 27 20:46:02 2020 (r368112) +++ head/sys/amd64/conf/GENERIC Fri Nov 27 21:37:48 2020 (r368113) @@ -102,7 +102,6 @@ options WITNESS # Enable checks to detect deadlocks 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 Modified: head/sys/amd64/conf/MINIMAL ============================================================================== --- head/sys/amd64/conf/MINIMAL Fri Nov 27 20:46:02 2020 (r368112) +++ head/sys/amd64/conf/MINIMAL Fri Nov 27 21:37:48 2020 (r368113) @@ -93,7 +93,6 @@ options WITNESS # Enable checks to detect deadlocks 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 Modified: head/sys/i386/conf/MINIMAL ============================================================================== --- head/sys/i386/conf/MINIMAL Fri Nov 27 20:46:02 2020 (r368112) +++ head/sys/i386/conf/MINIMAL Fri Nov 27 21:37:48 2020 (r368113) @@ -93,7 +93,6 @@ options WITNESS # Enable checks to detect deadlocks 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011272137.0ARLbmNN060116>