[kernel/f14/master] dmar: add dev->device print like i had intended...
Kyle McMartin
kyle at fedoraproject.org
Tue Oct 19 02:45:39 UTC 2010
commit e38a760c9ae1c306ca4fab60c74af07b0ddb5704
Author: Kyle McMartin <kyle at mcmartin.ca>
Date: Mon Oct 18 22:38:42 2010 -0400
dmar: add dev->device print like i had intended...
dmar-disable-when-ricoh-multifunction.patch | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/dmar-disable-when-ricoh-multifunction.patch b/dmar-disable-when-ricoh-multifunction.patch
index 13b1700..e0bbf30 100644
--- a/dmar-disable-when-ricoh-multifunction.patch
+++ b/dmar-disable-when-ricoh-multifunction.patch
@@ -11,14 +11,15 @@ diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 8e499e8..076c5de 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
-@@ -3755,6 +3755,17 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
+@@ -3755,6 +3755,18 @@ static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_rwbf);
+/* https://bugzilla.redhat.com/show_bug.cgi?id=605888 */
+static void __devinit quirk_ricoh_multifunction(struct pci_dev *dev)
+{
-+ printk(KERN_INFO "intel_iommu: broken Ricoh device %04X detected, disabling...\n");
++ printk(KERN_INFO "intel_iommu: broken Ricoh device %04X detected, disabling...\n",
++ dev->device);
+ dmar_disabled = 1;
+}
+DECLARE_PCI_FIXUP_HEADER(0x1180, 0xe822, quirk_ricoh_multifunction);
More information about the scm-commits
mailing list