From ee15bb18d88e9eb623e99039193025758c885f93 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Wed, 14 Dec 2011 20:22:45 -0500 Subject: Disable Intel IOMMU by default. --- config-x86-generic | 2 +- kernel.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/config-x86-generic b/config-x86-generic index 888577342..ebf16225c 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -39,7 +39,7 @@ CONFIG_FB_EFI=y CONFIG_INTEL_IOMMU=y CONFIG_DMAR_BROKEN_GFX_WA=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y -CONFIG_INTEL_IOMMU_DEFAULT_ON=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_SCSI_ADVANSYS=m CONFIG_SECCOMP=y diff --git a/kernel.spec b/kernel.spec index 7a03e3313..61e00cba0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 3 +%global baserelease 4 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2231,6 +2231,9 @@ fi # ||----w | # || || %changelog +* Thu Dec 15 2011 Dave Jones - 3.2.0-0.rc5.git2.4 +- Disable Intel IOMMU by default. + * Thu Dec 15 2011 Dave Jones - 3.2.0-0.rc5.git2.3 - Change configfs to be built-in. (rhbz 767432) -- cgit