[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <AANLkTin4v0=R0Q2etqi+WkLSJTV7T5J01rd+AbymutqG@mail.gmail.com>
Date: Fri, 29 Oct 2010 18:31:57 +0200
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Greg Ungerer <gerg@...pgear.com>
Cc: linux-m68k@...r.kernel.org, dhowells@...hat.com, gerg@...inux.org,
phdm@...qel.be, linux-kernel@...r.kernel.org
Subject: Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
On Fri, Oct 29, 2010 at 16:06, Greg Ungerer <gerg@...pgear.com> wrote:
> Philippe DeMuyter noticed this build failure with Linus' current git
> tree. I think it is m68k clean too. If all are ok with it I'll
> pass it directly to Linus.
Sorry, I saw his patch before, but had no spare cycles left for testing.
Unfortunately that breaks CONFIG_MMU=y:
arch/m68k/include/asm/irqflags.h: In function ‘arch_local_irq_enable’:
arch/m68k/include/asm/irqflags.h:43: error: implicit declaration of
function ‘hardirq_count’
But if you protect the #include <linux/hardirq.h> by #ifdef
CONFIG_MMU, I'm happy with
it.
> m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
>
> Recent changes to header files made kernel compilation for m68k/m68knommu
> fail with :
> CC arch/m68knommu/kernel/asm-offsets.s
> In file included from /archives/linux/git/arch/m68k/include/asm/system.h:2,
> from include/linux/wait.h:25,
> from include/linux/mmzone.h:9,
> from include/linux/gfp.h:4,
> from include/linux/irq.h:20,
> from include/asm-generic/hardirq.h:12,
> from
> /archives/linux/git/arch/m68k/include/asm/hardirq_no.h:17,
> from /archives/linux/git/arch/m68k/include/asm/hardirq.h:2,
> from include/linux/hardirq.h:10,
> from /archives/linux/git/arch/m68k/include/asm/irqflags.h:5,
> from include/linux/irqflags.h:15,
> from include/linux/spinlock.h:53,
> from include/linux/seqlock.h:29,
> from include/linux/time.h:8,
> from include/linux/timex.h:56,
> from include/linux/sched.h:56,
> from arch/m68knommu/kernel/asm-offsets.c:12:
> /archives/linux/git/arch/m68k/include/asm/system_no.h: In function
> ‘__xchg’:
> /archives/linux/git/arch/m68k/include/asm/system_no.h:79: error: implicit
> declaration of function ‘local_irq_save’
> /archives/linux/git/arch/m68k/include/asm/system_no.h:101: error: implicit
> declaration of function ‘local_irq_restore’
>
> Fix that
>
> Signed-off-by: Philippe De Muyter <phdm@...qel.be>
>
> ---
> diff --git a/arch/m68k/include/asm/irqflags.h
> b/arch/m68k/include/asm/irqflags.h
> index 4a5b284..38b414d 100644
> --- a/arch/m68k/include/asm/irqflags.h
> +++ b/arch/m68k/include/asm/irqflags.h
> @@ -2,7 +2,6 @@
> #define _M68K_IRQFLAGS_H
> #include <linux/types.h>
> -#include <linux/hardirq.h>
> #include <linux/preempt.h>
> #include <asm/thread_info.h>
> #include <asm/entry.h>
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/
Powered by blists - more mailing lists