git.openpandora.org
/
pandora-kernel.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...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
perf_cpum_cf.c
diff --git
a/arch/s390/kernel/perf_cpum_cf.c
b/arch/s390/kernel/perf_cpum_cf.c
index
c4e7269
..
86ec744
100644
(file)
--- a/
arch/s390/kernel/perf_cpum_cf.c
+++ b/
arch/s390/kernel/perf_cpum_cf.c
@@
-229,7
+229,7
@@
static void cpumf_measurement_alert(struct ext_code ext_code,
if (!(alert & CPU_MF_INT_CF_MASK))
return;
-
kstat_cpu(smp_processor_id()).irqs[EXTINT_CMC]++
;
+
inc_irq_stat(IRQEXT_CMC)
;
cpuhw = &__get_cpu_var(cpu_hw_events);
/* Measurement alerts are shared and might happen when the PMU