From b2f9efc00ba4af67428fce1092e443b1074d15ae Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 22 Jan 2009 00:38:56 -0800
Subject: [PATCH] --- yaml --- r: 135775 b: refs/heads/master c:
 d52a61c04c6c0814ca270a088feedb126436598e h: refs/heads/master i:   135773:
 3c447623cb2d35e3c57430b67dfabad7656f8313   135771:
 e9797a836b9ef12d1ff9cc9b4aff3f81947e1534   135767:
 ebc5c88e53288011340475e88810f314b70dc3a0   135759:
 7a8ad7c0e6b40bb16b4c7519ae3b1c548acd798c   135743:
 141678741ce6733a9a0ce3662993228357ddfcc9 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/irq.h         | 6 ------
 trunk/include/linux/kernel_stat.h | 9 ++++++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d46e17200f58..84f8700337ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e81838d2555e77c893f720c25bfb0c0e5782ef57
+refs/heads/master: d52a61c04c6c0814ca270a088feedb126436598e
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index e9a878978c85..48901e9a33b9 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -202,12 +202,6 @@ extern struct irq_desc irq_desc[NR_IRQS];
 extern struct irq_desc *move_irq_desc(struct irq_desc *old_desc, int cpu);
 #endif /* CONFIG_SPARSE_IRQ */
 
-#define kstat_irqs_this_cpu(DESC) \
-	((DESC)->kstat_irqs[smp_processor_id()])
-#define kstat_incr_irqs_this_cpu(irqno, DESC) \
-	((DESC)->kstat_irqs[smp_processor_id()]++)
-
-
 extern struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu);
 
 static inline struct irq_desc *
diff --git a/trunk/include/linux/kernel_stat.h b/trunk/include/linux/kernel_stat.h
index a3431b164bea..0c8b89f28a95 100644
--- a/trunk/include/linux/kernel_stat.h
+++ b/trunk/include/linux/kernel_stat.h
@@ -52,16 +52,19 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
 {
 	kstat_this_cpu.irqs[irq]++;
 }
-#endif
-
 
-#ifndef CONFIG_GENERIC_HARDIRQS
 static inline unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
 {
        return kstat_cpu(cpu).irqs[irq];
 }
 #else
+#include <linux/irq.h>
 extern unsigned int kstat_irqs_cpu(unsigned int irq, int cpu);
+#define kstat_irqs_this_cpu(DESC) \
+	((DESC)->kstat_irqs[smp_processor_id()])
+#define kstat_incr_irqs_this_cpu(irqno, DESC) \
+	((DESC)->kstat_irqs[smp_processor_id()]++)
+
 #endif
 
 /*