s390: Use include/asm-generic/dma-mapping-broken.h
PATCH 1/1 s390: Use include/asm-generic/dma-mapping-broken.h
Hi,
ChangeSet 1.1371.413.23 [1] introduced the file include/asm-generic/dma-mapping-broken.h for architectures that don't support the new DMA API. I don't know if this is the case with s390, however, ChangeSet 1.1371.445.6 [2] introduced a set of changes that duplicate those in include/asm-generic/dma-mapping-broken.h.
This patch squishes that duplication by simply including include/asm-generic/dma-mapping-broken.h in include/asm-s390/dma-mapping.h.
Against 2.6.7, but applies cleanly against 2.6.8-rc2. Thanks.
[1] http://tinyurl.com/7y2d9
[2] http://tinyurl.com/5qybl
Signed-off-by Arthur Othieno <[email protected]>
dma-mapping.h | 13 +------------ 1 files changed, 1 insertion(+), 12 deletions(-)
include/asm-s390/dma-mapping.h +1 -12
@@ -9,17 +9,6 @@#ifndef _ASM_DMA_MAPPING_H#define _ASM_DMA_MAPPING_H -static inline void *dma_alloc_coherent (struct device *dev,size_t size, -dma_addr_t *dma_handle,int flag) -{ -BUG (); -return 0 ; -} - -static inline void dma_free_coherent (struct device *dev,size_t size, -void *vaddr,dma_addr_t dma_handle) -{ -BUG (); -} +#include <asm-generic/dma-mapping-broken.h> #endif /* _ASM_DMA_MAPPING_H */