On Thu, 12 Aug 2010 10:07:01 +0200
Heiko Carstens <heiko.carstens@xxxxxxxxxx> wrote:
> Crap. By far not all converted architectures include dma-mapping-common.h
> from their private dma-mapping header file. So the patch would probably
> introduce a couple of new compile errors.
> Looks like we need an explicit ifdef.
>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> ---
>
> include/linux/dma-mapping.h | 2 ++
> 1 file changed, 2 insertions(+)
>
>
> diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
> index e0670a5..ce29b81 100644
> --- a/include/linux/dma-mapping.h
> +++ b/include/linux/dma-mapping.h
> @@ -142,6 +142,7 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
> return -EIO;
> }
>
> +#ifdef CONFIG_HAS_DMA
> static inline int dma_get_cache_alignment(void)
> {
> #ifdef ARCH_DMA_MINALIGN
> @@ -149,6 +150,7 @@ static inline int dma_get_cache_alignment(void)
> #endif
> return 1;
> }
> +#endif
Very sorry about this.
Acked-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx>
Looks like we had better to clean up dma-mapping headers on both
HAS_DMA and !HAS_DMA though.
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
