projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[linux-2.6-block.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 cb019f429e88ba22745a14bf38c714743c2383ad..9871b1971ed7602a7efef88fc62d019dde3b98c4 100644
(file)
--- a/
arch/s390/kernel/perf_cpum_cf.c
+++ b/
arch/s390/kernel/perf_cpum_cf.c
@@
-225,7
+225,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_C
PM
]++;
+ kstat_cpu(smp_processor_id()).irqs[EXTINT_C
MC
]++;
cpuhw = &__get_cpu_var(cpu_hw_events);
/* Measurement alerts are shared and might happen when the PMU