diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:34:56 -0400 |
| commit | 4cba3335826cbb36a218c3f5a1387e2c7c7ca9aa (patch) | |
| tree | f25a6a909464e088079902add80f5bc1d37cd99f /arch/x86/kernel/cpu | |
| parent | 7e92daaefa68e5ef1e1732e45231e73adbb724e7 (diff) | |
| parent | 402537fd9f5499d1a50a6f20cdd9031d24ee2e47 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Ingo Molnar:
"Leftover perf/urgent fix from the v3.6 cycle"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix typo in uncore_pmu_to_box
Diffstat (limited to 'arch/x86/kernel/cpu')
| -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 db917ec89040..99d96a4978b5 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 | |||
| 1950 | static struct intel_uncore_box * | 1950 | static struct intel_uncore_box * |
| 1951 | uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu) | 1951 | uncore_pmu_to_box(struct intel_uncore_pmu *pmu, int cpu) |
| 1952 | { | 1952 | { |
| 1953 | static struct intel_uncore_box *box; | 1953 | struct intel_uncore_box *box; |
| 1954 | 1954 | ||
| 1955 | box = *per_cpu_ptr(pmu->box, cpu); | 1955 | box = *per_cpu_ptr(pmu->box, cpu); |
| 1956 | if (box) | 1956 | if (box) |