Re: [PATCH] m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h

[Greg Ungerer <gerg@snapgear.com>]

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