commit fcdd65b0e7bbbd6aef9be2f20e7c238759cf0b41
author Heiko Carstens <heiko.carstens@de.ibm.com> Mon May 23 10:24:48 2011 +0200
committer Martin Schwidefsky <schwidefsky@de.ibm.com> Mon May 23 10:24:32 2011 +0200
tree 879ab0cc7112001e682147487fdee3a3e856c2a5
parent bfac1d2d34990bf6ce0abf947fd5043cf412256b

[S390] oprofile: add missing irq stats counter

Count CPU measurement external interrupts as well.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

arch/s390/include/asm/irq.h

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index db14a31..1544b90 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -15,6 +15,7 @@
 	EXTINT_VRT,
 	EXTINT_SCP,
 	EXTINT_IUC,
+	EXTINT_CPM,
 	IOINT_QAI,
 	IOINT_QDI,
 	IOINT_DAS,

arch/s390/kernel/irq.c

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index ea5099c..e204f95 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -32,6 +32,7 @@
 	{.name = "VRT", .desc = "[EXT] Virtio" },
 	{.name = "SCP", .desc = "[EXT] Service Call" },
 	{.name = "IUC", .desc = "[EXT] IUCV" },
+	{.name = "CPM", .desc = "[EXT] CPU Measurement" },
 	{.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
 	{.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
 	{.name = "DAS", .desc = "[I/O] DASD" },

arch/s390/oprofile/hwsampler.c

diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 8e686bf..cb4338c 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -5,6 +5,7 @@
  * Author: Heinz Graalfs <graalfs@de.ibm.com>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/smp.h>
@@ -677,6 +678,7 @@
 	int cpu;
 	struct hws_cpu_buffer *cb;
 
+	kstat_cpu(smp_processor_id()).irqs[EXTINT_CPM]++;
 	cpu = smp_processor_id();
 	cb = &per_cpu(sampler_cpu_buffer, cpu);