From be2be5d9307b513f7c33289c29a85f9cfb0084bf Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 23 May 2011 10:24:48 +0200
Subject: [PATCH] --- yaml --- r: 250555 b: refs/heads/master c:
 fcdd65b0e7bbbd6aef9be2f20e7c238759cf0b41 h: refs/heads/master i:   250553:
 9826b0eb1d21a639856874dd5cabf8eb4066f4bb   250551:
 e38a1ef44053b6e01a9c460b81083f336803c2f4 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/include/asm/irq.h    | 1 +
 trunk/arch/s390/kernel/irq.c         | 1 +
 trunk/arch/s390/oprofile/hwsampler.c | 2 ++
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 553e696a4a0b..3242609936ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfac1d2d34990bf6ce0abf947fd5043cf412256b
+refs/heads/master: fcdd65b0e7bbbd6aef9be2f20e7c238759cf0b41
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index db14a311f1d2..1544b90bd6d6 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -15,6 +15,7 @@ enum interruption_class {
 	EXTINT_VRT,
 	EXTINT_SCP,
 	EXTINT_IUC,
+	EXTINT_CPM,
 	IOINT_QAI,
 	IOINT_QDI,
 	IOINT_DAS,
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index ea5099c9709c..e204f9597aaf 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -32,6 +32,7 @@ static const struct irq_class intrclass_names[] = {
 	{.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" },
diff --git a/trunk/arch/s390/oprofile/hwsampler.c b/trunk/arch/s390/oprofile/hwsampler.c
index 8e686bfe2959..cb4338ccbf7b 100644
--- a/trunk/arch/s390/oprofile/hwsampler.c
+++ b/trunk/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 @@ static void hws_ext_handler(unsigned int ext_int_code,
 	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);