Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h

[Geert Uytterhoeven <geert@linux-m68k.org>]

On Tue, Apr 6, 2010 at 01:52, FUJITA Tomonori
<fujita.tomonori@lab.ntt.co.jp> wrote:
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Roman Zippel <zippel@linux-m68k.org>
> ---
>  arch/m68k/include/asm/scatterlist.h |   16 +---------------
>  1 files changed, 1 insertions(+), 15 deletions(-)
>
> diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h
> index e27ad90..175da06 100644
> --- a/arch/m68k/include/asm/scatterlist.h
> +++ b/arch/m68k/include/asm/scatterlist.h
> @@ -1,23 +1,9 @@
>  #ifndef _M68K_SCATTERLIST_H
>  #define _M68K_SCATTERLIST_H
>
> -#include <linux/types.h>
> -
> -struct scatterlist {
> -#ifdef CONFIG_DEBUG_SG
> -       unsigned long sg_magic;
> -#endif
> -       unsigned long page_link;
> -       unsigned int offset;
> -       unsigned int length;
> -
> -       dma_addr_t dma_address; /* A place to hang host-specific addresses at. */
> -};
> +#include <asm-generic/scatterlist.h>

This include should be ...

>  /* This is bogus and should go away. */
>  #define ISA_DMA_THRESHOLD (0x00ffffff)

... below this definition, else you get duplicate definition errors
(and the wrong definition).

> -#define sg_dma_address(sg)     ((sg)->dma_address)
> -#define sg_dma_len(sg)         ((sg)->length)
> -
>  #endif /* !(_M68K_SCATTERLIST_H) */
> --
> 1.7.0

Will apply (incl. the fix).

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds