perf, x86: Reorder intel_pmu_enable_all()
Subsystems (2)
Commit-ID: d329527e47851f84b1e7944ed9601205f35f1b93 Gitweb: http://git.kernel.org/tip/d329527e47851f84b1e7944ed9601205f35f1b93 Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 8 Mar 2010 13:57:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 10 Mar 2010 13:23:37 +0100
perf, x86: Reorder intel_pmu_enable_all()
The documentation says we have to enable PEBS before we enable the PMU proper.
Signed-off-by Peter Zijlstra <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +2 -3
@@ -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)) {
@@ -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 )