Re: [patch 158/200] m68k: convert to asm-generic/hardirq.h

[Geert Uytterhoeven]

On Tue, Sep 22, 2009 at 02:04,  <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
> From: Christoph Hellwig <hch@xxxxxx>
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

This one broke the m68k build, cfr.
http://kisskb.ellerman.id.au/kisskb/buildresult/1295096/.
I guess including <asm-generic/hardirq.h> here exposes us to Include Hell...

`git revert 45d80eea87c9f8292d2d33173d6866c0ec57238a` fixes it.

> ---
>
> Âarch/m68k/include/asm/hardirq_mm.h | Â 12 ++----------
> Â1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff -puN arch/m68k/include/asm/hardirq_mm.h~m68k-convert-to-asm-generic-hardirqh arch/m68k/include/asm/hardirq_mm.h
> --- a/arch/m68k/include/asm/hardirq_mm.h~m68k-convert-to-asm-generic-hardirqh
> +++ a/arch/m68k/include/asm/hardirq_mm.h
> @@ -1,16 +1,8 @@
> Â#ifndef __M68K_HARDIRQ_H
> Â#define __M68K_HARDIRQ_H
>
> -#include <linux/threads.h>
> -#include <linux/cache.h>
> -
> -/* entry.S is sensitive to the offsets of these fields */
> -typedef struct {
> - Â Â Â unsigned int __softirq_pending;
> -} ____cacheline_aligned irq_cpustat_t;
> -
> -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
> -
> Â#define HARDIRQ_BITS Â 8
>
> +#include <asm-generic/hardirq.h>
> +
> Â#endif

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/