* [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
@ 2011-07-03 8:55 Geert Uytterhoeven
2011-07-03 9:09 ` Geert Uytterhoeven
0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2011-07-03 8:55 UTC (permalink / raw)
To: Greg Ungerer; +Cc: uClinux list, Linux/m68k
It is not machine-specific, but common irq infrastructure.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
I will need this for m68k genirq soon.
arch/m68k/include/asm/irq.h | 2 ++
arch/m68k/include/asm/machdep.h | 1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index ddc5958..8c615d7 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -160,4 +160,6 @@ extern unsigned int irq_canonicalize(unsigned int irq);
#define irq_canonicalize(irq) (irq)
#endif /* CONFIG_MMU */
+extern void do_IRQ(int irq, struct pt_regs *fp);
+
#endif /* _M68K_IRQ_H_ */
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
index 415d548..789f3b2 100644
--- a/arch/m68k/include/asm/machdep.h
+++ b/arch/m68k/include/asm/machdep.h
@@ -40,6 +40,5 @@ extern unsigned long hw_timer_offset(void);
extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);
extern void config_BSP(char *command, int len);
-extern void do_IRQ(int irq, struct pt_regs *fp);
#endif /* _M68K_MACHDEP_H */
--
1.7.0.4
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 related [flat|nested] 4+ messages in thread* Re: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
2011-07-03 8:55 [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h Geert Uytterhoeven
@ 2011-07-03 9:09 ` Geert Uytterhoeven
2011-07-04 0:26 ` Greg Ungerer
0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2011-07-03 9:09 UTC (permalink / raw)
To: Greg Ungerer; +Cc: uClinux list, Linux/m68k
Oops, there's also an asmlinkage missing. Corrected patch below.
>From 63dab1c663875083f095819431bbc6560c2a8dfb Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 3 Jul 2011 10:49:58 +0200
Subject: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
It is not machine-specific, but common irq infrastructure.
Also add the missing asmlinkage, to match its definition.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
I will need this for m68k genirq soon.
arch/m68k/include/asm/irq.h | 2 ++
arch/m68k/include/asm/machdep.h | 1 -
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index ddc5958..abde607 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -160,4 +160,6 @@ extern unsigned int irq_canonicalize(unsigned int irq);
#define irq_canonicalize(irq) (irq)
#endif /* CONFIG_MMU */
+asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
+
#endif /* _M68K_IRQ_H_ */
diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
index 415d548..789f3b2 100644
--- a/arch/m68k/include/asm/machdep.h
+++ b/arch/m68k/include/asm/machdep.h
@@ -40,6 +40,5 @@ extern unsigned long hw_timer_offset(void);
extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);
extern void config_BSP(char *command, int len);
-extern void do_IRQ(int irq, struct pt_regs *fp);
#endif /* _M68K_MACHDEP_H */
--
1.7.0.4
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 related [flat|nested] 4+ messages in thread* Re: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
2011-07-03 9:09 ` Geert Uytterhoeven
@ 2011-07-04 0:26 ` Greg Ungerer
2011-07-04 19:55 ` Geert Uytterhoeven
0 siblings, 1 reply; 4+ messages in thread
From: Greg Ungerer @ 2011-07-04 0:26 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Greg Ungerer, uClinux list, Linux/m68k
Hi Geert,
On 03/07/11 19:09, Geert Uytterhoeven wrote:
> Oops, there's also an asmlinkage missing. Corrected patch below.
>
> from 63dab1c663875083f095819431bbc6560c2a8dfb Mon Sep 17 00:00:00 2001
> From: Geert Uytterhoeven<geert@linux-m68k.org>
> Date: Sun, 3 Jul 2011 10:49:58 +0200
> Subject: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
>
> It is not machine-specific, but common irq infrastructure.
> Also add the missing asmlinkage, to match its definition.
>
> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Looks good. Are you going to push this one, or do you want
me too?
Regards
Greg
> ---
> I will need this for m68k genirq soon.
>
> arch/m68k/include/asm/irq.h | 2 ++
> arch/m68k/include/asm/machdep.h | 1 -
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
> index ddc5958..abde607 100644
> --- a/arch/m68k/include/asm/irq.h
> +++ b/arch/m68k/include/asm/irq.h
> @@ -160,4 +160,6 @@ extern unsigned int irq_canonicalize(unsigned int irq);
> #define irq_canonicalize(irq) (irq)
> #endif /* CONFIG_MMU */
>
> +asmlinkage void do_IRQ(int irq, struct pt_regs *regs);
> +
> #endif /* _M68K_IRQ_H_ */
> diff --git a/arch/m68k/include/asm/machdep.h b/arch/m68k/include/asm/machdep.h
> index 415d548..789f3b2 100644
> --- a/arch/m68k/include/asm/machdep.h
> +++ b/arch/m68k/include/asm/machdep.h
> @@ -40,6 +40,5 @@ extern unsigned long hw_timer_offset(void);
> extern irqreturn_t arch_timer_interrupt(int irq, void *dummy);
>
> extern void config_BSP(char *command, int len);
> -extern void do_IRQ(int irq, struct pt_regs *fp);
>
> #endif /* _M68K_MACHDEP_H */
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
8 Gardner Close FAX: +61 7 3217 5323
Milton, QLD, 4064, Australia WEB: http://www.SnapGear.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h
2011-07-04 0:26 ` Greg Ungerer
@ 2011-07-04 19:55 ` Geert Uytterhoeven
0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2011-07-04 19:55 UTC (permalink / raw)
To: Greg Ungerer; +Cc: Greg Ungerer, uClinux list, Linux/m68k
Hi Greg,
On Mon, Jul 4, 2011 at 02:26, Greg Ungerer <gerg@snapgear.com> wrote:
> On 03/07/11 19:09, Geert Uytterhoeven wrote:
>> Oops, there's also an asmlinkage missing. Corrected patch below.
>>
>> from 63dab1c663875083f095819431bbc6560c2a8dfb Mon Sep 17 00:00:00 2001
>> From: Geert Uytterhoeven<geert@linux-m68k.org>
>> Date: Sun, 3 Jul 2011 10:49:58 +0200
>> Subject: [PATCH] m68knommu: Move forward declaration of do_IRQ() from
>> machdep.h to irq.h
>>
>> It is not machine-specific, but common irq infrastructure.
>> Also add the missing asmlinkage, to match its definition.
>>
>> Signed-off-by: Geert Uytterhoeven<geert@linux-m68k.org>
>
> Acked-by: Greg Ungerer <gerg@uclinux.org>
Thanks!
> Looks good. Are you going to push this one, or do you want
> me too?
I'll add it to my genirq WIP branch when needed. But I don't mind if it enters
Linus' tree via yours.
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
end of thread, other threads:[~2011-07-04 19:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 8:55 [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h Geert Uytterhoeven
2011-07-03 9:09 ` Geert Uytterhoeven
2011-07-04 0:26 ` Greg Ungerer
2011-07-04 19:55 ` Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox