3 files changed, 8 insertions, 3 deletions

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index eadfa9fc03ba..ba6d85f88d50 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -8,7 +8,8 @@ enum interruption_class {
         EXTERNAL_INTERRUPT,
         IO_INTERRUPT,
         EXTINT_CLK,
-        EXTINT_IPI,
+        EXTINT_EXC,
+        EXTINT_EMS,
         EXTINT_TMR,
         EXTINT_TLA,
         EXTINT_PFL,
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 30faaef34457..b9a7fdd9c814 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -33,7 +33,8 @@ static const struct irq_class intrclass_names[] = {
         {.name = "EXT" },
         {.name = "I/O" },
         {.name = "CLK", .desc = "[EXT] Clock Comparator" },
-        {.name = "IPI", .desc = "[EXT] Signal Processor" },
+        {.name = "EXC", .desc = "[EXT] External Call" },
+        {.name = "EMS", .desc = "[EXT] Emergency Signal" },
         {.name = "TMR", .desc = "[EXT] CPU Timer" },
         {.name = "TAL", .desc = "[EXT] Timing Alert" },
         {.name = "PFL", .desc = "[EXT] Pseudo Page Fault" },
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 3bde5688ceb5..3ea872890da2 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -187,7 +187,10 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
 {
         unsigned long bits;
 
-        kstat_cpu(smp_processor_id()).irqs[EXTINT_IPI]++;
+        if (ext_int_code == 0x1202)
+                kstat_cpu(smp_processor_id()).irqs[EXTINT_EXC]++;
+        else
+                kstat_cpu(smp_processor_id()).irqs[EXTINT_EMS]++;
         /*
          * handle bit signal external calls
          */