summaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/sclp.c
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2013-02-11 19:03:52 +0000
committerMarc Zyngier <marc.zyngier@arm.com>2013-02-11 19:03:52 +0000
commit9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080 (patch)
treef059571830a159f05b8cdf4ec354b01ca7d6bc45 /drivers/s390/char/sclp.c
parent75431f9d7335daf7fb9e72b3a1539ce610142618 (diff)
parent9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff)
downloadtalos-op-linux-9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080.tar.gz
talos-op-linux-9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080.zip
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
Diffstat (limited to 'drivers/s390/char/sclp.c')
-rw-r--r--drivers/s390/char/sclp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 4fa21f7e2308..12c16a65dd25 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -400,7 +400,7 @@ static void sclp_interrupt_handler(struct ext_code ext_code,
u32 finished_sccb;
u32 evbuf_pending;
- kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
+ inc_irq_stat(IRQEXT_SCP);
spin_lock(&sclp_lock);
finished_sccb = param32 & 0xfffffff8;
evbuf_pending = param32 & 0x3;
@@ -813,7 +813,7 @@ static void sclp_check_handler(struct ext_code ext_code,
{
u32 finished_sccb;
- kstat_cpu(smp_processor_id()).irqs[EXTINT_SCP]++;
+ inc_irq_stat(IRQEXT_SCP);
finished_sccb = param32 & 0xfffffff8;
/* Is this the interrupt we are waiting for? */
if (finished_sccb == 0)
OpenPOWER on IntegriCloud