diff options
author | Dave Jones <davej@redhat.com> | 2011-12-14 20:22:45 -0500 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2011-12-14 20:22:45 -0500 |
commit | ee15bb18d88e9eb623e99039193025758c885f93 (patch) | |
tree | de5d33144018c7de5f9d46f9d2b8d9137bdfa721 | |
parent | 70e0ba3345e707cd59f6f1342a7176699e0e91a5 (diff) | |
download | kernel-ee15bb18d88e9eb623e99039193025758c885f93.tar.gz kernel-ee15bb18d88e9eb623e99039193025758c885f93.tar.xz kernel-ee15bb18d88e9eb623e99039193025758c885f93.zip |
Disable Intel IOMMU by default.
-rw-r--r-- | config-x86-generic | 2 | ||||
-rw-r--r-- | 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 <davej@redhat.com> - 3.2.0-0.rc5.git2.4 +- Disable Intel IOMMU by default. + * Thu Dec 15 2011 Dave Jones <davej@redhat.com> - 3.2.0-0.rc5.git2.3 - Change configfs to be built-in. (rhbz 767432) |