diff options
| author |   Yan, Zheng <zheng.z.yan@intel.com> | 2012-09-27 09:33:26 +0800 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2012-09-27 08:05:13 +0200 |
| commit | 402537fd9f5499d1a50a6f20cdd9031d24ee2e47 (patch) | |
| tree | 2beeaf61f4ec56e61b55c961044427a00796bf51 /arch/x86/kernel/cpu/perf_event_intel_uncore.c | |
| parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
| download | linux-dev-402537fd9f5499d1a50a6f20cdd9031d24ee2e47.tar.xz linux-dev-402537fd9f5499d1a50a6f20cdd9031d24ee2e47.zip | |
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@intel.com>
Cc: eranian@google.com
Cc: a.p.zijlstra@chello.nl
Link: http://lkml.kernel.org/r/1348709606-2759-1-git-send-email-zheng.z.yan@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel_uncore.c')
| -rw-r--r-- | 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 38e4894165b9..c7c55e74ac60 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) |