From 908db3b387f11e8da5b2342900f7f6aa33016b46 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Wed, 5 Aug 2009 12:24:45 +0000
Subject: [PATCH] --- yaml --- r: 161747 b: refs/heads/master c:
 6826a57d1abc8ac9f59b24f1a008554c6560a995 h: refs/heads/master i:   161745:
 ae42a5ee1cc39f0fc3d2445e07feee33aadc9d8f   161743:
 4d1b3f977d33cefd458c45e39c0cfec4c031429c v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/powerpc/include/asm/hardirq.h | 30 +-----------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 174ad58f679c..bf4e307d4fbf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a5f900148d058bce2d7bdce3d6bcbcb40267ec
+refs/heads/master: 6826a57d1abc8ac9f59b24f1a008554c6560a995
diff --git a/trunk/arch/powerpc/include/asm/hardirq.h b/trunk/arch/powerpc/include/asm/hardirq.h
index 288e14d53b7f..fb3c05a0cbbf 100644
--- a/trunk/arch/powerpc/include/asm/hardirq.h
+++ b/trunk/arch/powerpc/include/asm/hardirq.h
@@ -1,29 +1 @@
-#ifndef _ASM_POWERPC_HARDIRQ_H
-#define _ASM_POWERPC_HARDIRQ_H
-#ifdef __KERNEL__
-
-#include <asm/irq.h>
-#include <asm/bug.h>
-
-/* The __last_jiffy_stamp field is needed to ensure that no decrementer
- * interrupt is lost on SMP machines. Since on most CPUs it is in the same
- * cache line as local_irq_count, it is cheap to access and is also used on UP
- * for uniformity.
- */
-typedef struct {
-	unsigned int __softirq_pending;	/* set_bit is used on this */
-	unsigned int __last_jiffy_stamp;
-} ____cacheline_aligned irq_cpustat_t;
-
-#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
-
-#define last_jiffy_stamp(cpu) __IRQ_STAT((cpu), __last_jiffy_stamp)
-
-static inline void ack_bad_irq(int irq)
-{
-	printk(KERN_CRIT "illegal vector %d received!\n", irq);
-	BUG();
-}
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_POWERPC_HARDIRQ_H */
+#include <asm-generic/hardirq.h>