lkml.org 
[lkml]   [2009]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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
arch/x86/kernel/amd_iommu_init.c between commit
ea1b0d3945c7374849235b6ecaea1191ee1d9d50 ("x86: amd_iommu: Convert
amd_iommu_detect() to use iommu_init hook") from Linus' tree and commit
5d990b627537e59a3a2f039ff588a4750e9c1a6a ("PCI: add pci_request_acs")
from the pci tree.

I did a fixup (see below) but I have no confidence in it. Please check.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/x86/kernel/amd_iommu_init.c
index 7ffc399,e60530a..0000000
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@@ -1335,7 -1326,12 +1335,9 @@@ void __init amd_iommu_detect(void
if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
iommu_detected = 1;
amd_iommu_detected = 1;
-#ifdef CONFIG_GART_IOMMU
- gart_iommu_aperture_disabled = 1;
- gart_iommu_aperture = 0;
-#endif
+ x86_init.iommu.iommu_init = amd_iommu_init;
+ /* Make sure ACS will be enabled */
+ pci_request_acs();
}
}



\
 
 \ /
  Last update: 2009-12-07 01:55    [W:0.027 / U:3.080 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site