Merge 3.8-rc5 into tty-next

This resolves a number of tty driver merge issues found in linux-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 2e575cff9845..7d4ecb65db00 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -61,11 +61,10 @@ dev_fsm_event(struct ccw_device *cdev, enum dev_event dev_event)
 
         if (dev_event == DEV_EVENT_INTERRUPT) {
                 if (state == DEV_STATE_ONLINE)
-                        kstat_cpu(smp_processor_id()).
-                                irqs[cdev->private->int_class]++;
+                        inc_irq_stat(cdev->private->int_class);
                 else if (state != DEV_STATE_CMFCHANGE &&
                          state != DEV_STATE_CMFUPDATE)
-                        kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
+                        inc_irq_stat(IRQIO_CIO);
         }
         dev_jumptable[state][dev_event](cdev, dev_event);
 }