Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
arch/x86/mm/init_32.c between commit
304e629bf4a3150a0bf6556fc45c52c5c082340f ("x86: corruption check: run the
corruption checks from a work queue") from Linus' tree and commit
cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 ("x86: unify pci iommu setup and
allow swiotlb to compile for 32 bit") from the iommu tree.
Just overlapping removal/addition. I fixed it up (see below) and can
carry the fix as necessay.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/mm/init_32.c
index bdcbe2c,2b4b14f..0000000
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@@ -969,6 -970,10 +970,8 @@@ void __init mem_init(void
int codesize, reservedpages, datasize, initsize;
int tmp;
- start_periodic_check_for_corruption();
-
+ pci_iommu_alloc();
+
#ifdef CONFIG_FLATMEM
BUG_ON(!mem_map);
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
