Hi all,
Today's linux-next merge of the tip-core tree got a conflict in
arch/x86/kernel/pci-nommu.c between commit
1894e36754d682cc049b2b1c3825da8e585967d5 ("x86: pci-nommu.c cleanup")
from the x86 tree and commits 33feffd4525fc2e4dd0a322fb5d07d61f85d791e
("x86, pci-nommu: add map_page"),
d7dff84053524186b139342ac66a4160ce6bb517 ("x86: remove map_single and
unmap_single in struct dma_mapping_ops") and
160c1d8e40866edfeae7d68816b7005d70acf391 ("x86, ia64: convert to use
generic dma_map_ops struct") from the tip-core tree.
I fixed it up (see below) (which is the same as in tip/master) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/pci-nommu.c
index 8b02a39,fe50214..0000000
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@@ -78,12 -79,12 +79,12 @@@ static void nommu_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
- struct dma_mapping_ops nommu_dma_ops = {
+ struct dma_map_ops nommu_dma_ops = {
- .alloc_coherent = dma_generic_alloc_coherent,
- .free_coherent = nommu_free_coherent,
- .map_sg = nommu_map_sg,
- .map_page = nommu_map_page,
- .is_phys = 1,
+ .alloc_coherent = dma_generic_alloc_coherent,
+ .free_coherent = nommu_free_coherent,
- .map_single = nommu_map_single,
+ .map_sg = nommu_map_sg,
++ .map_page = nommu_map_page,
+ .is_phys = 1,
};
void __init no_iommu_init(void)
--
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
