[PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

[PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

[Greg Ungerer]

(Note: this bounced back to me from the m68k-linux list,
not sure why... resending)


Hi David, m68kers,

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.

Regards
Greg

---------------------------------------------------------------------

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@macqel.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>

Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

[Geert Uytterhoeven]

On Fri, Oct 29, 2010 at 16:06, Greg Ungerer <gerg@snapgear.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@macqel.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@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

Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

[Greg Ungerer]

Hi Geert,

On 30/10/10 02:31, Geert Uytterhoeven wrote:
> On Fri, Oct 29, 2010 at 16:06, Greg Ungerer<gerg@snapgear.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.

Thanks, I'll rework it with that.

Regards
Greg


>> 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@macqel.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@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
>


-- 
------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear Group, McAfee                      PHONE:       +61 7 3435 2888
8 Gardner Close,                            FAX:         +61 7 3891 3630
Milton, QLD, 4064, Australia                WEB: http://www.SnapGear.com

Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h

[Philippe De Muyter]

Greg, Geert,

On Sat, Oct 30, 2010 at 07:57:30AM +1000, Greg Ungerer wrote:
>
> Hi Geert,
>
> On 30/10/10 02:31, Geert Uytterhoeven wrote:
>> On Fri, Oct 29, 2010 at 16:06, Greg Ungerer<gerg@snapgear.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’

Oops.  I am sorry.

>>
>> But if you protect the #include<linux/hardirq.h>  by #ifdef
>> CONFIG_MMU, I'm happy with
>> it.
>
> Thanks, I'll rework it with that.

Thanks to both of you

Philippe