Commit-ID: 402537fd9f5499d1a50a6f20cdd9031d24ee2e47
Gitweb: http://git.kernel.org/tip/402537fd9f5499d1a50a6f20cdd9031d24ee2e47
Author: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
AuthorDate: Thu, 27 Sep 2012 09:33:26 +0800
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Thu, 27 Sep 2012 08:05:13 +0200
perf/x86: Fix typo in uncore_pmu_to_box
The variable box should not be declared as static.
This could probably cause crashes with sufficiently parallel
uncore PMU use.
Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
Cc: eranian@xxxxxxxxxx
Cc: a.p.zijlstra@xxxxxxxxx
Link: http://lkml.kernel.org/r/1348709606-2759-1-git-send-email-zheng.z.yan@xxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 38e4894..c7c55e7 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -1950,7 +1950,7 @@ struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cp
static struct intel_uncore_box *
uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu)
{
- static struct intel_uncore_box *box;
+ struct intel_uncore_box *box;
box = *per_cpu_ptr(pmu->box, cpu);
if (box)
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|