The patch titled
Subject: dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2
has been removed from the -mm tree. Its filename was
dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2.patch
This patch was dropped because it was folded into dma-mapping-consolidate-dma_allocfree_attrscoherent.patch
------------------------------------------------------
From: Max Filippov <jcmvbkbc@xxxxxxxxx>
Subject: dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2
fix xtensa
Signed-off-by: Max Filippov <jcmvbkbc@xxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/xtensa/include/asm/dma-mapping.h | 31 ------------------------
1 file changed, 31 deletions(-)
diff -puN arch/xtensa/include/asm/dma-mapping.h~dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2 arch/xtensa/include/asm/dma-mapping.h
--- a/arch/xtensa/include/asm/dma-mapping.h~dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2
+++ a/arch/xtensa/include/asm/dma-mapping.h
@@ -34,37 +34,6 @@ static inline struct dma_map_ops *get_dm
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL)
#define dma_free_noncoherent(d, s, v, h) dma_free_attrs(d, s, v, h, NULL)
-#define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL)
-#define dma_free_coherent(d, s, c, h) dma_free_attrs(d, s, c, h, NULL)
-
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t gfp,
- struct dma_attrs *attrs)
-{
- void *ret;
- struct dma_map_ops *ops = get_dma_ops(dev);
-
- if (dma_alloc_from_coherent(dev, size, dma_handle, &ret))
- return ret;
-
- ret = ops->alloc(dev, size, dma_handle, gfp, attrs);
- debug_dma_alloc_coherent(dev, size, *dma_handle, ret);
-
- return ret;
-}
-
-static inline void dma_free_attrs(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle,
- struct dma_attrs *attrs)
-{
- struct dma_map_ops *ops = get_dma_ops(dev);
-
- if (dma_release_from_coherent(dev, get_order(size), vaddr))
- return;
-
- ops->free(dev, size, vaddr, dma_handle, attrs);
- debug_dma_free_coherent(dev, size, vaddr, dma_handle);
-}
static inline int
dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
_
Patches currently in -mm which might be from jcmvbkbc@xxxxxxxxx are
dma-mapping-consolidate-dma_allocfree_attrscoherent.patch
dma-mapping-consolidate-dma_allocfree_noncoherent-fix.patch
dma-mapping-cosolidate-dma_mapping_error-fix.patch
dma-mapping-consolidate-dma_supported-fix.patch
dma-mapping-consolidate-dma_set_mask-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
