The patch titled
Subject: dma-mapping-consolidate-dma_set_mask-fix
has been added to the -mm tree. Its filename is
dma-mapping-consolidate-dma_set_mask-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/dma-mapping-consolidate-dma_set_mask-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/dma-mapping-consolidate-dma_set_mask-fix.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Max Filippov <jcmvbkbc@xxxxxxxxx>
Subject: dma-mapping-consolidate-dma_set_mask-fix
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 | 11 -----------
1 file changed, 11 deletions(-)
diff -puN arch/xtensa/include/asm/dma-mapping.h~dma-mapping-consolidate-dma_set_mask-fix arch/xtensa/include/asm/dma-mapping.h
--- a/arch/xtensa/include/asm/dma-mapping.h~dma-mapping-consolidate-dma_set_mask-fix
+++ a/arch/xtensa/include/asm/dma-mapping.h
@@ -32,17 +32,6 @@ static inline struct dma_map_ops *get_dm
#include <asm-generic/dma-mapping-common.h>
-static inline int
-dma_set_mask(struct device *dev, u64 mask)
-{
- if(!dev->dma_mask || !dma_supported(dev, mask))
- return -EIO;
-
- *dev->dma_mask = mask;
-
- return 0;
-}
-
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction);
_
Patches currently in -mm which might be from jcmvbkbc@xxxxxxxxx are
dma-mapping-consolidate-dma_allocfree_attrscoherent-fix-fix-2.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
