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

[Heiko Carstens <heiko.carstens@de.ibm.com>]

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?