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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <p2q10f740e81004230129rd5b07889m5ec7f453efd46403@mail.gmail.com>
Date:	Fri, 23 Apr 2010 10:29:04 +0200
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Cc:	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
	Roman Zippel <zippel@...ux-m68k.org>,
	"Linux/m68k" <linux-m68k@...r.kernel.org>
Subject: Re: [PATCH -mm 06/12] m68k: use asm-generic/scatterlist.h

On Tue, Apr 6, 2010 at 01:52, FUJITA Tomonori
<fujita.tomonori@....ntt.co.jp> wrote:
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
> Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: Roman Zippel <zippel@...ux-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@...ux-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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/