From aea044f67684a0818127a4ec1a0280ac7a499db8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 2 Jan 2013 16:54:12 +0100
Subject: [PATCH] --- yaml --- r: 348523 b: refs/heads/master c:
 93f3b2ee0abff5438e74cc90cf816429248cc8eb h: refs/heads/master i:   348521:
 0ef71fa723351fa41efee61a426f6facaddd113f   348519:
 de4c7139ac608878393feb2a605f921aa2166098 v: v3

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

diff --git a/[refs] b/[refs]
index 561762569d5c..46b90768a686 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420f42ecf48a926ba775ec7d7294425f004b6ade
+refs/heads/master: 93f3b2ee0abff5438e74cc90cf816429248cc8eb
diff --git a/trunk/arch/s390/include/asm/irq.h b/trunk/arch/s390/include/asm/irq.h
index c98dcac70ae0..7def77302d63 100644
--- a/trunk/arch/s390/include/asm/irq.h
+++ b/trunk/arch/s390/include/asm/irq.h
@@ -42,6 +42,7 @@ enum interruption_class {
 	IRQIO_PCI,
 	IRQIO_MSI,
 	NMI_NMI,
+	CPU_RST,
 	NR_ARCH_IRQS
 };
 
diff --git a/trunk/arch/s390/kernel/irq.c b/trunk/arch/s390/kernel/irq.c
index 5f5462447aff..9df824ea1667 100644
--- a/trunk/arch/s390/kernel/irq.c
+++ b/trunk/arch/s390/kernel/irq.c
@@ -82,6 +82,7 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = {
 	[IRQIO_PCI]  = {.name = "PCI", .desc = "[I/O] PCI Interrupt" },
 	[IRQIO_MSI]  = {.name = "MSI", .desc = "[I/O] MSI Interrupt" },
 	[NMI_NMI]    = {.name = "NMI", .desc = "[NMI] Machine Check"},
+	[CPU_RST]    = {.name = "RST", .desc = "[CPU] CPU Restart"},
 };
 
 /*
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index 4a36d5b5e4c9..7433a2f9e5cc 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -709,6 +709,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
 	pfault_init();
 	notify_cpu_starting(smp_processor_id());
 	set_cpu_online(smp_processor_id(), true);
+	inc_irq_stat(CPU_RST);
 	local_irq_enable();
 	/* cpu_idle will call schedule for us */
 	cpu_idle();