From facc1bc749dc8942c4f7212052c632019e162722 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 21 Sep 2009 17:04:02 -0700
Subject: [PATCH] --- yaml --- r: 164499 b: refs/heads/master c:
 1f693665457539e919856149151b7a7e96550d70 h: refs/heads/master i:   164497:
 99ee6fff338474db21569b61b2e2d960d6b1b1f0   164495:
 ec6c470a7f8b8bd3a3751817219aad22e75cb970 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/alpha/include/asm/hardirq.h | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 31dfd5b34805..fb9bbe95b8b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 621731980fe1b19f0a107e17e2af5f8d4411db3e
+refs/heads/master: 1f693665457539e919856149151b7a7e96550d70
diff --git a/trunk/arch/alpha/include/asm/hardirq.h b/trunk/arch/alpha/include/asm/hardirq.h
index 88971460fa6c..242c09ba98c4 100644
--- a/trunk/arch/alpha/include/asm/hardirq.h
+++ b/trunk/arch/alpha/include/asm/hardirq.h
@@ -1,17 +1,9 @@
 #ifndef _ALPHA_HARDIRQ_H
 #define _ALPHA_HARDIRQ_H
 
-#include <linux/threads.h>
-#include <linux/cache.h>
-
-
-/* entry.S is sensitive to the offsets of these fields */
-typedef struct {
-	unsigned long __softirq_pending;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
 void ack_bad_irq(unsigned int irq);
+#define ack_bad_irq ack_bad_irq
+
+#include <asm-generic/hardirq.h>
 
 #endif /* _ALPHA_HARDIRQ_H */