The patch titled
m68k: dma API addition
has been removed from the -mm tree. Its filename is
m68k-dma-api-addition.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: m68k: dma API addition
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Additions to dma API with some small cleanups.
Signed-off-by: Richard Hirst <rhirst@xxxxxxxxxxx>
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/asm-m68k/dma-mapping.h | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff -puN include/asm-m68k/dma-mapping.h~m68k-dma-api-addition include/asm-m68k/dma-mapping.h
--- a/include/asm-m68k/dma-mapping.h~m68k-dma-api-addition
+++ a/include/asm-m68k/dma-mapping.h
@@ -1,6 +1,8 @@
#ifndef _M68K_DMA_MAPPING_H
#define _M68K_DMA_MAPPING_H
+#include <asm/cache.h>
+
struct scatterlist;
static inline int dma_supported(struct device *dev, u64 mask)
@@ -13,11 +15,37 @@ static inline int dma_set_mask(struct de
return 0;
}
+static inline int dma_get_cache_alignment(void)
+{
+ return 1 << L1_CACHE_SHIFT;
+}
+
+static inline int dma_is_consistent(dma_addr_t dma_addr)
+{
+ return 0;
+}
+
extern void *dma_alloc_coherent(struct device *, size_t,
dma_addr_t *, int);
extern void dma_free_coherent(struct device *, size_t,
void *, dma_addr_t);
+static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
+ dma_addr_t *handle, int flag)
+{
+ return dma_alloc_coherent(dev, size, handle, flag);
+}
+static inline void dma_free_noncoherent(struct device *dev, size_t size,
+ void *addr, dma_addr_t handle)
+{
+ dma_free_coherent(dev, size, addr, handle);
+}
+static inline void dma_cache_sync(void *vaddr, size_t size,
+ enum dma_data_direction dir)
+{
+ /* we use coherent allocation, so not much to do here. */
+}
+
extern dma_addr_t dma_map_single(struct device *, void *, size_t,
enum dma_data_direction);
static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-and-optimize-clock-source-update.patch
fix-rt-mutex-defaults-and-dependencies.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
