[PATCH 4/4] cris: turn on GENERIC_HARDIRQS_NO__DO_IRQ

From: Kyle McMartin
Date: Fri Oct 15 2010 - 00:05:37 EST


Since we no longer require __do_IRQ.

Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxx>
---
arch/cris/Kconfig | 3 +++
arch/cris/include/asm/irq.h | 3 ---
arch/cris/kernel/irq.c | 4 ----
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index aefe3b1..459d4f7 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -78,6 +78,9 @@ config GENERIC_HARDIRQS
bool
default y

+config GENERIC_HARDIRQS_NO__DO_IRQ
+ def_bool y
+
config ETRAX_CMDLINE
string "Kernel command line"
default "root=/dev/mtdblock3"
diff --git a/arch/cris/include/asm/irq.h b/arch/cris/include/asm/irq.h
index 3406c68..ce0fcf5 100644
--- a/arch/cris/include/asm/irq.h
+++ b/arch/cris/include/asm/irq.h
@@ -8,9 +8,6 @@ static inline int irq_canonicalize(int irq)
return irq;
}

-struct irq_desc;
-extern void cris_do_IRQ(unsigned int irq, struct irq_desc *desc);
-
#endif /* _ASM_IRQ_H */


diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index b6d54eb..14d9ce9 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -105,7 +105,3 @@ void weird_irq(void)
while(1);
}

-void cris_do_IRQ(unsigned int irq, struct irq_desc *desc)
-{
- __do_IRQ(irq);
-}
--
1.7.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/