From 26fbe3684a090da23289abe8009fba0c49dd1583 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 30 Jan 2013 14:16:02 +0100 Subject: [PATCH] --- yaml --- r: 356117 b: refs/heads/master c: e978948db125cc3b90cc324c68e7787f0ac7be4a h: refs/heads/master i: 356115: ee73aacabf294bc67722377849cd0335f0e9bd28 v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/dma-mapping.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 25c85ec0af6e..8a8e962a2335 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e06ef372839c0c33f5f91f892ae632cef38cd259 +refs/heads/master: e978948db125cc3b90cc324c68e7787f0ac7be4a diff --git a/trunk/arch/s390/include/asm/dma-mapping.h b/trunk/arch/s390/include/asm/dma-mapping.h index 8a32f7dfd3af..e74bc7ac72e0 100644 --- a/trunk/arch/s390/include/asm/dma-mapping.h +++ b/trunk/arch/s390/include/asm/dma-mapping.h @@ -20,8 +20,11 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) extern int dma_set_mask(struct device *dev, u64 mask); extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle); -extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size, - enum dma_data_direction direction); + +static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, + enum dma_data_direction direction) +{ +} #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)