1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index eb3140ee821e..dc67c397449e 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -622,6 +622,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
                 if (!sch) {
                         /* Clear pending interrupt condition. */
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                         tsch(tpi_info->schid, irb);
                         continue;
                 }
@@ -634,7 +635,10 @@ void __irq_entry do_IRQ(struct pt_regs *regs)
                         /* Call interrupt handler if there is one. */
                         if (sch->driver && sch->driver->irq)
                                 sch->driver->irq(sch);
-                }
+                        else
+                                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+                } else
+                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 spin_unlock(sch->lock);
                 /*
                  * Are more interrupts pending?
@@ -667,18 +671,23 @@ static int cio_tpi(void)
         tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
         if (tpi(NULL) != 1)
                 return 0;
+        kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
         if (tpi_info->adapter_IO) {
                 do_adapter_IO(tpi_info->isc);
                 return 1;
         }
         irb = (struct irb *)&S390_lowcore.irb;
         /* Store interrupt response block to lowcore. */
-        if (tsch(tpi_info->schid, irb) != 0)
+        if (tsch(tpi_info->schid, irb) != 0) {
                 /* Not status pending or not operational. */
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
-        if (!sch)
+        if (!sch) {
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
                 return 1;
+        }
         irq_context = in_interrupt();
         if (!irq_context)
                 local_bh_disable();
@@ -687,6 +696,8 @@ static int cio_tpi(void)
         memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
         if (sch->driver && sch->driver->irq)
                 sch->driver->irq(sch);
+        else
+                kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
         spin_unlock(sch->lock);
         irq_exit();
         if (!irq_context)
@@ -1058,7 +1069,7 @@ void reipl_ccw_dev(struct ccw_dev_id *devid)
 {
         struct subchannel_id schid;
 
-        s390_reset_system();
+        s390_reset_system(NULL, NULL);
         if (reipl_find_schid(devid, &schid) != 0)
                 panic("IPL Device not found\n");
         do_reipl_asm(*((__u32*)&schid));