* [tip:perf/core] perf_events, x86: Fix event constraints code
2009-10-13 3:42 linux-next: tip tree build warning Stephen Rothwell
@ 2009-10-13 6:24 ` tip-bot for Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Ingo Molnar @ 2009-10-13 6:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, acme, paulus, hpa, mingo, a.p.zijlstra, efault,
eranian, fweisbec, tglx, sfr, mingo
Commit-ID: 7a693d3f0d10f978ebdf3082c41404ab97106567
Gitweb: http://git.kernel.org/tip/7a693d3f0d10f978ebdf3082c41404ab97106567
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Tue, 13 Oct 2009 08:16:30 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 13 Oct 2009 08:19:53 +0200
perf_events, x86: Fix event constraints code
There was namespace overlap due to a rename i did - this caused
the following build warning, reported by Stephen Rothwell against
linux-next x86_64 allmodconfig:
arch/x86/kernel/cpu/perf_event.c: In function 'intel_get_event_idx':
arch/x86/kernel/cpu/perf_event.c:1445: warning: 'event_constraint' is used uninitialized in this function
This is a real bug not just a warning: fix it by renaming the
global event-constraints table pointer to 'event_constraints'.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Stephane Eranian <eranian@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091013144223.369d616d.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/cpu/perf_event.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 9961d84..2e20bca 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -124,7 +124,7 @@ static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = {
.enabled = 1,
};
-static const struct event_constraint *event_constraint;
+static const struct event_constraint *event_constraints;
/*
* Not sure about some of these
@@ -1442,12 +1442,12 @@ intel_get_event_idx(struct cpu_hw_events *cpuc, struct hw_perf_event *hwc)
const struct event_constraint *event_constraint;
int i, code;
- if (!event_constraint)
+ if (!event_constraints)
goto skip;
code = hwc->config & CORE_EVNTSEL_EVENT_MASK;
- for_each_event_constraint(event_constraint, event_constraint) {
+ for_each_event_constraint(event_constraint, event_constraints) {
if (code == event_constraint->code) {
for_each_bit(i, event_constraint->idxmsk, X86_PMC_IDX_MAX) {
if (!test_and_set_bit(i, cpuc->used_mask))
@@ -2047,12 +2047,12 @@ static int p6_pmu_init(void)
case 7:
case 8:
case 11: /* Pentium III */
- event_constraint = intel_p6_event_constraints;
+ event_constraints = intel_p6_event_constraints;
break;
case 9:
case 13:
/* Pentium M */
- event_constraint = intel_p6_event_constraints;
+ event_constraints = intel_p6_event_constraints;
break;
default:
pr_cont("unsupported p6 CPU model %d ",
@@ -2124,14 +2124,14 @@ static int intel_pmu_init(void)
sizeof(hw_cache_event_ids));
pr_cont("Core2 events, ");
- event_constraint = intel_core_event_constraints;
+ event_constraints = intel_core_event_constraints;
break;
default:
case 26:
memcpy(hw_cache_event_ids, nehalem_hw_cache_event_ids,
sizeof(hw_cache_event_ids));
- event_constraint = intel_nehalem_event_constraints;
+ event_constraints = intel_nehalem_event_constraints;
pr_cont("Nehalem/Corei7 events, ");
break;
case 28:
^ permalink raw reply [flat|nested] 2+ messages in thread