Skip to content

Commit

Permalink
perf, x86: Reorder intel_pmu_enable_all()
Browse files Browse the repository at this point in the history
The documentation says we have to enable PEBS before we enable the PMU
proper.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: paulus@samba.org
Cc: eranian@google.com
Cc: robert.richter@amd.com
Cc: fweisbec@gmail.com
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Mar 10, 2010
1 parent 2df202b commit d329527
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/x86/kernel/cpu/perf_event_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ static void intel_pmu_enable_all(void)
{
struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);

intel_pmu_pebs_enable_all();
intel_pmu_lbr_enable_all();
wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, x86_pmu.intel_ctrl);

if (test_bit(X86_PMC_IDX_FIXED_BTS, cpuc->active_mask)) {
Expand All @@ -498,9 +500,6 @@ static void intel_pmu_enable_all(void)

intel_pmu_enable_bts(event->hw.config);
}

intel_pmu_pebs_enable_all();
intel_pmu_lbr_enable_all();
}

static inline u64 intel_pmu_get_status(void)
Expand Down

0 comments on commit d329527

Please sign in to comment.