From ea7ff58137e0b115bf3f01c46e99681057d40584 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 17 Nov 2009 14:39:31 -0800
Subject: [PATCH] --- yaml --- r: 176450 b: refs/heads/master c:
 ce378f7da8dd2fb6c5bb126505ea1d0c6cdc8eb5 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/avr32/include/asm/hardirq.h | 19 +------------------
 trunk/arch/avr32/kernel/irq.c          |  9 ---------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index e73273fefacb..3b344d69e4aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 559300bc0ef7ccd541656f1189d38e7088389559
+refs/heads/master: ce378f7da8dd2fb6c5bb126505ea1d0c6cdc8eb5
diff --git a/trunk/arch/avr32/include/asm/hardirq.h b/trunk/arch/avr32/include/asm/hardirq.h
index 015bc75ea798..9e36e3ff77d2 100644
--- a/trunk/arch/avr32/include/asm/hardirq.h
+++ b/trunk/arch/avr32/include/asm/hardirq.h
@@ -1,23 +1,6 @@
 #ifndef __ASM_AVR32_HARDIRQ_H
 #define __ASM_AVR32_HARDIRQ_H
-
-#include <linux/threads.h>
-#include <asm/irq.h>
-
 #ifndef __ASSEMBLY__
-
-#include <linux/cache.h>
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-	unsigned int __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-void ack_bad_irq(unsigned int irq);
-
-/* Standard mappings for irq_cpustat_t above */
-#include <linux/irq_cpustat.h>
-
+#include <asm-generic/hardirq.h>
 #endif /* __ASSEMBLY__ */
-
 #endif /* __ASM_AVR32_HARDIRQ_H */
diff --git a/trunk/arch/avr32/kernel/irq.c b/trunk/arch/avr32/kernel/irq.c
index 9f572229d318..09904d22309f 100644
--- a/trunk/arch/avr32/kernel/irq.c
+++ b/trunk/arch/avr32/kernel/irq.c
@@ -16,15 +16,6 @@
 #include <linux/seq_file.h>
 #include <linux/sysdev.h>
 
-/*
- * 'what should we do if we get a hw irq event on an illegal vector'.
- * each architecture has to answer this themselves.
- */
-void ack_bad_irq(unsigned int irq)
-{
-	printk("unexpected IRQ %u\n", irq);
-}
-
 /* May be overridden by platform code */
 int __weak nmi_enable(void)
 {