From 6a826e1602e4a202727a742c795f101511d4e2d1 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 15 Nov 2010 14:46:46 +0000
Subject: [PATCH] --- yaml --- r: 225875 b: refs/heads/master c:
 b54992fe1b4bad7b7488d58b8696e4e8974fdab0 h: refs/heads/master i:   225873:
 807b2ff207cfec20973148112b8a91d11d4d4acd   225871:
 7c88fc4650e0a0c5f263fb0878cc9e8d49709fbd v: v3

---
 [refs]                               |  2 +-
 trunk/arch/arm/include/asm/hardirq.h |  8 ++++++++
 trunk/arch/arm/kernel/smp.c          | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5cba6fe00508..a8a8aff1f193 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a88abd7b48e8ec8084b1252d0f5ebdab43c2508
+refs/heads/master: b54992fe1b4bad7b7488d58b8696e4e8974fdab0
diff --git a/trunk/arch/arm/include/asm/hardirq.h b/trunk/arch/arm/include/asm/hardirq.h
index c52e2507c9e0..89ad1805e579 100644
--- a/trunk/arch/arm/include/asm/hardirq.h
+++ b/trunk/arch/arm/include/asm/hardirq.h
@@ -22,6 +22,14 @@ typedef struct {
 #define __inc_irq_stat(cpu, member)	__IRQ_STAT(cpu, member)++
 #define __get_irq_stat(cpu, member)	__IRQ_STAT(cpu, member)
 
+#ifdef CONFIG_SMP
+u64 smp_irq_stat_cpu(unsigned int cpu);
+#else
+#define smp_irq_stat_cpu(cpu)	0
+#endif
+
+#define arch_irq_stat_cpu	smp_irq_stat_cpu
+
 #if NR_IRQS > 512
 #define HARDIRQ_BITS	10
 #elif NR_IRQS > 256
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index fa0c5f6e1587..1de3e13a42a1 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -406,6 +406,21 @@ void show_ipi_list(struct seq_file *p, int prec)
 	}
 }
 
+u64 smp_irq_stat_cpu(unsigned int cpu)
+{
+	u64 sum = 0;
+	int i;
+
+	for (i = 0; i < NR_IPI; i++)
+		sum += __get_irq_stat(cpu, ipi_irqs[i]);
+
+#ifdef CONFIG_LOCAL_TIMERS
+	sum += __get_irq_stat(cpu, local_timer_irqs);
+#endif
+
+	return sum;
+}
+
 /*
  * Timer (local or broadcast) support
  */