diff --git a/dmar-disable-when-ricoh-multifunction.patch b/dmar-disable-when-ricoh-multifunction.patch deleted file mode 100644 index 839db59..0000000 --- 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 -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 496da7e..c20db58 100644 --- a/kernel.spec +++ b/kernel.spec @@ -703,8 +703,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 @@ -1431,9 +1429,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 @@ -2341,6 +2336,9 @@ fi # ||----w | # || || %changelog +* Wed Mar 06 2013 Justin M. Forbes +- Remove Ricoh multifunction DMAR patch as it's no longer needed (rhbz 880051) + * Wed Mar 06 2013 Josh Boyer - Fix regression in secure-boot acpi_rsdp patch (rhbz 906225) - crypto: info leaks in report API (rhbz 918512 918521)