diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2013-03-06 10:09:37 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2013-03-06 10:09:37 -0600 |
| commit | a728032789a96d311fcd847035551599595839e2 (patch) | |
| tree | 24632b5d10a9bdce63e3dbada8fdffb1c24160ba | |
| parent | 3ce66bca1d49f88d7611c9db02d076739a6d7719 (diff) | |
| download | kernel-a728032789a96d311fcd847035551599595839e2.tar.gz kernel-a728032789a96d311fcd847035551599595839e2.tar.xz kernel-a728032789a96d311fcd847035551599595839e2.zip | |
Remove Ricoh multifunction DMAR patch as it's no longer needed (rhbz 880051)
| -rw-r--r-- | dmar-disable-when-ricoh-multifunction.patch | 33 | ||||
| -rw-r--r-- | kernel.spec | 8 |
2 files changed, 3 insertions, 38 deletions
diff --git a/dmar-disable-when-ricoh-multifunction.patch b/dmar-disable-when-ricoh-multifunction.patch deleted file mode 100644 index 839db5940..000000000 --- a/dmar-disable-when-ricoh-multifunction.patch +++ /dev/null @@ -1,33 +0,0 @@ -From da7662784dcced04a5b7a3a5b2bbb8276d699522 Mon Sep 17 00:00:00 2001 -From: Kyle McMartin <kyle@mcmartin.ca> -Date: Sun, 17 Oct 2010 15:55:32 -0400 -Subject: [PATCH] dmar: disable if ricoh multifunction detected - ---- - drivers/pci/intel-iommu.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c -index 4789f8e..5923914 100644 ---- a/drivers/iommu/intel-iommu.c -+++ b/drivers/iommu/intel-iommu.c -@@ -3784,6 +3784,16 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0044, quirk_calpella_no_shadow_g - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0062, quirk_calpella_no_shadow_gtt); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x006a, quirk_calpella_no_shadow_gtt); - -+/* https://bugzilla.redhat.com/show_bug.cgi?id=605888 */ -+static void quirk_ricoh_multifunction(struct pci_dev *dev) -+{ -+ dmar_disabled = 1; -+} -+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe822, quirk_ricoh_multifunction); -+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe230, quirk_ricoh_multifunction); -+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe832, quirk_ricoh_multifunction); -+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe476, quirk_ricoh_multifunction); -+ - /* On Tylersburg chipsets, some BIOSes have been known to enable the - ISOCH DMAR unit for the Azalia sound device, but not give it any - TLB entries, which causes it to deadlock. Check for that. We do --- -1.7.3.1 - diff --git a/kernel.spec b/kernel.spec index 5cb4fdb50..4bd488e10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -690,8 +690,6 @@ Patch10000: fs-proc-devtree-remove_proc_entry.patch Patch12016: disable-i8042-check-on-apple-mac.patch -Patch12303: dmar-disable-when-ricoh-multifunction.patch - Patch13003: efi-dont-map-boot-services-on-32bit.patch Patch14000: hibernate-freeze-filesystems.patch @@ -1396,9 +1394,6 @@ ApplyPatch fs-proc-devtree-remove_proc_entry.patch ApplyPatch disable-i8042-check-on-apple-mac.patch -# rhbz#605888 -ApplyPatch dmar-disable-when-ricoh-multifunction.patch - ApplyPatch efi-dont-map-boot-services-on-32bit.patch # FIXME: REBASE @@ -2283,6 +2278,9 @@ fi # ||----w | # || || %changelog +* Wed Mar 06 2013 Justin M. Forbes <jforbes@redhat.com> +- Remove Ricoh multifunction DMAR patch as it's no longer needed (rhbz 880051) + * Tue Mar 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git0.3 - Fix intel_pstate init error path (rhbz 916833) |