From 0b1bc4994c6e1f91157acee0abbb3a22ad0b53ef Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Sun, 31 Jan 2010 20:30:23 +0000
Subject: [PATCH] --- yaml --- r: 181898 b: refs/heads/master c:
 8c007bfdf1bab536f824d91fccc76596c18aba78 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/powerpc/include/asm/hardirq.h | 23 ++++++++++++++++++++++-
 trunk/arch/powerpc/kernel/irq.c          |  3 +++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92c5f78ff70a..8c5c36efdd90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d3d50bf1913561ef3b1f5b53115c5a481ba9b1e
+refs/heads/master: 8c007bfdf1bab536f824d91fccc76596c18aba78
diff --git a/trunk/arch/powerpc/include/asm/hardirq.h b/trunk/arch/powerpc/include/asm/hardirq.h
index fb3c05a0cbbf..9bf3467581b1 100644
--- a/trunk/arch/powerpc/include/asm/hardirq.h
+++ b/trunk/arch/powerpc/include/asm/hardirq.h
@@ -1 +1,22 @@
-#include <asm-generic/hardirq.h>
+#ifndef _ASM_POWERPC_HARDIRQ_H
+#define _ASM_POWERPC_HARDIRQ_H
+
+#include <linux/threads.h>
+#include <linux/irq.h>
+
+typedef struct {
+	unsigned int __softirq_pending;
+} ____cacheline_aligned irq_cpustat_t;
+
+DECLARE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
+
+#define __ARCH_IRQ_STAT
+
+#define local_softirq_pending()	__get_cpu_var(irq_stat).__softirq_pending
+
+static inline void ack_bad_irq(unsigned int irq)
+{
+	printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
+}
+
+#endif /* _ASM_POWERPC_HARDIRQ_H */
diff --git a/trunk/arch/powerpc/kernel/irq.c b/trunk/arch/powerpc/kernel/irq.c
index 9040330b0530..c6ac5583672a 100644
--- a/trunk/arch/powerpc/kernel/irq.c
+++ b/trunk/arch/powerpc/kernel/irq.c
@@ -73,6 +73,9 @@
 #define CREATE_TRACE_POINTS
 #include <asm/trace.h>
 
+DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
+EXPORT_PER_CPU_SYMBOL(irq_stat);
+
 int __irq_offset_value;
 static int ppc_spurious_interrupts;