From: Yan, Zheng Date: Thu, 27 Sep 2012 01:33:26 +0000 (+0800) Subject: perf/x86: Fix typo in uncore_pmu_to_box X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=402537fd9f5499d1a50a6f20cdd9031d24ee2e47;p=openwrt%2Fstaging%2Fblogic.git 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 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 --- 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)