projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
s390
/
cio
/
cio.c
diff --git
a/drivers/s390/cio/cio.c
b/drivers/s390/cio/cio.c
index 8e927b9f285f25de6ba520bf04f07661a02e51aa..c8faf6230b0f332010678f5c4aced898cb20b66d 100644
(file)
--- a/
drivers/s390/cio/cio.c
+++ b/
drivers/s390/cio/cio.c
@@
-611,7
+611,7
@@
void __irq_entry do_IRQ(struct pt_regs *regs)
tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
irb = (struct irb *)&S390_lowcore.irb;
do {
tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
irb = (struct irb *)&S390_lowcore.irb;
do {
- kstat_
cpu(smp_processor_id()).irqs[IO_INTERRUPT]++
;
+ kstat_
incr_irqs_this_cpu(IO_INTERRUPT, NULL)
;
if (tpi_info->adapter_IO) {
do_adapter_IO(tpi_info->isc);
continue;
if (tpi_info->adapter_IO) {
do_adapter_IO(tpi_info->isc);
continue;
@@
-619,7
+619,7
@@
void __irq_entry do_IRQ(struct pt_regs *regs)
sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
if (!sch) {
/* Clear pending interrupt condition. */
sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
if (!sch) {
/* Clear pending interrupt condition. */
-
kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++
;
+
inc_irq_stat(IRQIO_CIO)
;
tsch(tpi_info->schid, irb);
continue;
}
tsch(tpi_info->schid, irb);
continue;
}
@@
-633,9
+633,9
@@
void __irq_entry do_IRQ(struct pt_regs *regs)
if (sch->driver && sch->driver->irq)
sch->driver->irq(sch);
else
if (sch->driver && sch->driver->irq)
sch->driver->irq(sch);
else
-
kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++
;
+
inc_irq_stat(IRQIO_CIO)
;
} else
} else
-
kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++
;
+
inc_irq_stat(IRQIO_CIO)
;
spin_unlock(sch->lock);
/*
* Are more interrupts pending?
spin_unlock(sch->lock);
/*
* Are more interrupts pending?
@@
-678,7
+678,7
@@
static void cio_tsch(struct subchannel *sch)
if (sch->driver && sch->driver->irq)
sch->driver->irq(sch);
else
if (sch->driver && sch->driver->irq)
sch->driver->irq(sch);
else
-
kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++
;
+
inc_irq_stat(IRQIO_CIO)
;
if (!irq_context) {
irq_exit();
_local_bh_enable();
if (!irq_context) {
irq_exit();
_local_bh_enable();