* [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h
@ 2010-10-29 14:06 Greg Ungerer
2010-10-29 16:31 ` Geert Uytterhoeven
0 siblings, 1 reply; 4+ messages in thread
From: Greg Ungerer @ 2010-10-29 14:06 UTC (permalink / raw)
To: linux-m68k; +Cc: dhowells, gerg, phdm
(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>
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h 2010-10-29 14:06 [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h Greg Ungerer @ 2010-10-29 16:31 ` Geert Uytterhoeven 2010-10-29 21:57 ` Greg Ungerer 0 siblings, 1 reply; 4+ messages in thread From: Geert Uytterhoeven @ 2010-10-29 16:31 UTC (permalink / raw) To: Greg Ungerer; +Cc: linux-m68k, dhowells, gerg, phdm, linux-kernel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h 2010-10-29 16:31 ` Geert Uytterhoeven @ 2010-10-29 21:57 ` Greg Ungerer 2010-10-30 5:08 ` Philippe De Muyter 0 siblings, 1 reply; 4+ messages in thread From: Greg Ungerer @ 2010-10-29 21:57 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: linux-m68k, dhowells, gerg, phdm, linux-kernel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h 2010-10-29 21:57 ` Greg Ungerer @ 2010-10-30 5:08 ` Philippe De Muyter 0 siblings, 0 replies; 4+ messages in thread From: Philippe De Muyter @ 2010-10-30 5:08 UTC (permalink / raw) To: Greg Ungerer; +Cc: Geert Uytterhoeven, linux-m68k, dhowells, gerg, linux-kernel 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-30 5:09 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-10-29 14:06 [PATCH][resend] m68k,m68knommu: Do not include linux/hardirq.h in asm/irqflags.h Greg Ungerer 2010-10-29 16:31 ` Geert Uytterhoeven 2010-10-29 21:57 ` Greg Ungerer 2010-10-30 5:08 ` Philippe De Muyter
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.