Messages in this thread | | | Date | Mon, 23 Apr 2012 16:03:09 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the dma-mapping tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the dma-mapping tree got a conflict in arch/x86/include/asm/dma-mapping.h between commit f7219a5300ba ("x86: Introduce CONFIG_X86_DMA_REMAP") from the tip tree and commit cfe29d4b429b ("X86: integrate CMA with DMA-mapping subsystem") from the dma-mapping tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/include/asm/dma-mapping.h index 61c0bd2,7b9227b..0000000 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@@ -62,12 -63,10 +63,16 @@@ extern void *dma_generic_alloc_coherent dma_addr_t *dma_addr, gfp_t flag, struct dma_attrs *attrs); + extern void dma_generic_free_coherent(struct device *dev, size_t size, + void *vaddr, dma_addr_t dma_addr, + struct dma_attrs *attrs); + +#ifdef CONFIG_X86_DMA_REMAP /* Platform code defines bridge-specific code */ +extern bool dma_capable(struct device *dev, dma_addr_t addr, size_t size); +extern dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); +extern phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); +#else + static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) { if (!dev->dma_mask) [unhandled content-type:application/pgp-signature] | |