[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20091207112557.dfbe6b6e.sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2009 11:25:57 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>,
Ingo Molnar <mingo@...e.hu>,
Chris Wright <chrisw@...s-sol.org>,
Linus <torvalds@...ux-foundation.org>
Subject: linux-next: manual merge of the pci tree with Linus' tree
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
drivers/pci/dmar.c between commit
75f1cdf1dda92cae037ec848ae63690d91913eac ("x86: Handle HW IOMMU
initialization failure gracefully") from Linus' tree and commit
5d990b627537e59a3a2f039ff588a4750e9c1a6a ("PCI: add pci_request_acs")
from the pci tree.
Just context changes. I fxied it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc drivers/pci/dmar.c
index 416f6ac,0e98f6b..0000000
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -645,13 -613,13 +645,16 @@@ void __init detect_intel_iommu(void
"x2apic and Intr-remapping.\n");
#endif
#ifdef CONFIG_DMAR
- if (ret && !no_iommu && !iommu_detected && !dmar_disabled)
- if (ret && !no_iommu && !iommu_detected && !swiotlb &&
- !dmar_disabled) {
++ if (ret && !no_iommu && !iommu_detected && !dmar_disabled) {
iommu_detected = 1;
+ /* Make sure ACS will be enabled */
+ pci_request_acs();
+ }
#endif
+#ifdef CONFIG_X86
+ if (ret)
+ x86_init.iommu.iommu_init = intel_iommu_init;
+#endif
}
early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
dmar_tbl = NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists