Skip to contentSkip to conversation

sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case

PATCH NAK Al Viro 2 participants 2 messages Mar 14, 2007

lore
Share & tools
lore

Al Viro

author
#0 lore raw

PATCH 11/13 sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case

Signed-off-by Al Viro <[email protected]>
---
 include/asm-sparc/dma-mapping.h |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
include/asm-sparc/dma-mapping.h +1 -14
index 6db83dc..f3a641e 100644
@@ -5,20 +5,7 @@
 #ifdef CONFIG_PCI
 #include <asm-generic/dma-mapping.h>
 #else
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-			 dma_addr_t *dma_handle, gfp_t flag)
-{
-	BUG();
-	return NULL;
-}
-
-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 /* PCI */
 
 #endif /* _ASM_SPARC_DMA_MAPPING_H */
Signature · 1 line
1.5.0-rc2.GIT
#1 lore raw
Quoted 22 lines · Al Viro
Signed-off-by Al Viro <[email protected]>
---
 include/asm-sparc/dma-mapping.h |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
include/asm-sparc/dma-mapping.h +0 -8
index 6db83dc..f3a641e 100644
@@ -5,20 +5,7 @@
 #ifdef CONFIG_PCI
 #include <asm-generic/dma-mapping.h>
 #else
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-			 dma_addr_t *dma_handle, gfp_t flag)
-{
-	BUG();
-	return NULL;
-}
-

include/asm-sparc/dma-mapping.h line 11

Quoted 10 lines
include/asm-sparc/dma-mapping.h +1 -6
-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 /* PCI */
 
 #endif /* _ASM_SPARC_DMA_MAPPING_H */

This one is in -mm : http://lkml.org/lkml/2007/2/26/107
So maybe you don't need to add another reference to dma-mapping-broken.h?