lkml.org 
[lkml]   [2009]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] m68knommu: convert to asm-generic/hardirq.h
Hi Christoph,

Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Compile testing revealed:

LD vmlinux
kernel/built-in.o: In function `ack_bad':
handle.c:(.text+0x215f6): undefined reference to `ack_bad_irq'
kernel/built-in.o: In function `handle_bad_irq':
(.text+0x219dc): undefined reference to `ack_bad_irq'
make[2]: *** [vmlinux] Error 1


I did this to fix it:

--- a/arch/m68k/include/asm/hardirq_no.h
+++ b/arch/m68k/include/asm/hardirq_no.h
@@ -14,9 +14,6 @@
# error HARDIRQ_BITS is too low!
#endif

-void ack_bad_irq(unsigned int irq);
-#define ack_bad_irq ack_bad_irq
-
#include <asm-generic/hardirq.h>

#endif /* __M68K_HARDIRQ_H */
What do you think?

Regards
Greg



> Index: linux-2.6/arch/m68k/include/asm/hardirq_no.h
> ===================================================================
> --- linux-2.6.orig/arch/m68k/include/asm/hardirq_no.h 2009-07-27 14:35:39.630898799 +0200
> +++ linux-2.6/arch/m68k/include/asm/hardirq_no.h 2009-07-27 14:56:09.546901120 +0200
> @@ -1,16 +1,8 @@
> #ifndef __M68K_HARDIRQ_H
> #define __M68K_HARDIRQ_H
>
> -#include <linux/cache.h>
> -#include <linux/threads.h>
> #include <asm/irq.h>
>
> -typedef struct {
> - unsigned int __softirq_pending;
> -} ____cacheline_aligned irq_cpustat_t;
> -
> -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
> -
> #define HARDIRQ_BITS 8
>
> /*
> @@ -23,5 +15,8 @@ typedef struct {
> #endif
>
> void ack_bad_irq(unsigned int irq);
> +#define ack_bad_irq ack_bad_irq
> +
> +#include <asm-generic/hardirq.h>
>
> #endif /* __M68K_HARDIRQ_H */
> Index: linux-2.6/arch/m68knommu/kernel/irq.c
> ===================================================================
> --- linux-2.6.orig/arch/m68knommu/kernel/irq.c 2009-07-27 14:53:45.783148910 +0200
> +++ linux-2.6/arch/m68knommu/kernel/irq.c 2009-07-27 14:56:18.687931620 +0200
> @@ -29,11 +29,6 @@ asmlinkage void do_IRQ(int irq, struct p
> set_irq_regs(oldregs);
> }
>
> -void ack_bad_irq(unsigned int irq)
> -{
> - printk(KERN_ERR "IRQ: unexpected irq=%d\n", irq);
> -}
> -
> static struct irq_chip m_irq_chip = {
> .name = "M68K-INTC",
> .enable = enable_vector,
>

--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@snapgear.com
SnapGear Group, McAfee PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com

\
 
 \ /
  Last update: 2009-08-05 06:57    [W:0.053 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site