]> git.baikalelectronics.ru Git - kernel.git/commit
s390/irq: enable irq sum accounting for /proc/stat again
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Wed, 2 Jan 2013 13:01:23 +0000 (14:01 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 8 Jan 2013 09:57:06 +0000 (10:57 +0100)
commit832cd0293efb35d2ebb86ace1990009b2ab82993
tree6a7fc68aea8f39f9df1139262ce7b98e44c73daa
parent11057099ba71f9423ecd2dc42e016e8370aa59d2
s390/irq: enable irq sum accounting for /proc/stat again

For more than two years, since 27a91eec75109f0b3211867ee7948e9271739557
"/proc/stat: scalability of irq num per cpu" the output of /proc/stat is
broken.
The first field in the "intr" line should contain the sum of all interrupts,
however since the above mentioned change it is always zero.

The reason for that is that a per cpu irq sum variable had been introduced
which got incremented when calling kstat_incr_irqs_this_cpu(). However
on s390 we directly incremented only the per cpu per irq counter by accessing
the array element via kstat_cpu(smp_processor_id()).irqs[...].
So fix this and use the kstat_incr_irqs_this_cpu() wrapper which increments
both: the per cpu per irq counter and the per cpu irq sum counter.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/kernel/irq.c
drivers/s390/cio/cio.c