* [PATCH 11/13] sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case
@ 2007-03-14 9:16 Al Viro
2007-03-14 9:41 ` Heiko Carstens
0 siblings, 1 reply; 2+ messages in thread
From: Al Viro @ 2007-03-14 9:16 UTC (permalink / raw)
To: torvalds; +Cc: davem, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
include/asm-sparc/dma-mapping.h | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
diff --git a/include/asm-sparc/dma-mapping.h b/include/asm-sparc/dma-mapping.h
index 6db83dc..f3a641e 100644
--- a/include/asm-sparc/dma-mapping.h
+++ b/include/asm-sparc/dma-mapping.h
@@ -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 */
--
1.5.0-rc2.GIT
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH 11/13] sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case
2007-03-14 9:16 [PATCH 11/13] sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case Al Viro
@ 2007-03-14 9:41 ` Heiko Carstens
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Carstens @ 2007-03-14 9:41 UTC (permalink / raw)
To: Al Viro; +Cc: torvalds, davem, linux-kernel
On Wed, Mar 14, 2007 at 09:16:44AM +0000, Al Viro wrote:
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
> include/asm-sparc/dma-mapping.h | 15 +--------------
> 1 files changed, 1 insertions(+), 14 deletions(-)
>
> diff --git a/include/asm-sparc/dma-mapping.h b/include/asm-sparc/dma-mapping.h
> index 6db83dc..f3a641e 100644
> --- a/include/asm-sparc/dma-mapping.h
> +++ b/include/asm-sparc/dma-mapping.h
> @@ -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 */
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-14 9:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-14 9:16 [PATCH 11/13] sparc: have dma-mapping.h include generic/dma-mapping-broken in non-PCI case Al Viro
2007-03-14 9:41 ` Heiko Carstens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®