Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cba3335 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7e92daae 402537fd

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -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)