diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 19:12:11 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 19:12:11 (GMT) |
commit | b0338e99b2a775c157e3e795f49fdcfb6c257f7a (patch) | |
tree | 59573cd20718ebb5145b05938ef3fb428bde65c7 /arch/x86/kernel/cpu/perf_event_intel.c | |
parent | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (diff) | |
parent | 715c85b1fc824e9cd0ea07d6ceb80d2262f32e90 (diff) | |
download | linux-fsl-qoriq-b0338e99b2a775c157e3e795f49fdcfb6c257f7a.tar.xz |
Merge branch 'x86/cpu' into perf/core
Merge this branch because we changed the wrmsr*_safe() API and there's
a conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index e23e71f..8408e37 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c @@ -1003,11 +1003,11 @@ static void intel_pmu_reset(void) printk("clearing PMU state on CPU#%d\n", smp_processor_id()); for (idx = 0; idx < x86_pmu.num_counters; idx++) { - checking_wrmsrl(x86_pmu_config_addr(idx), 0ull); - checking_wrmsrl(x86_pmu_event_addr(idx), 0ull); + wrmsrl_safe(x86_pmu_config_addr(idx), 0ull); + wrmsrl_safe(x86_pmu_event_addr(idx), 0ull); } for (idx = 0; idx < x86_pmu.num_counters_fixed; idx++) - checking_wrmsrl(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull); + wrmsrl_safe(MSR_ARCH_PERFMON_FIXED_CTR0 + idx, 0ull); if (ds) ds->bts_index = ds->bts_buffer_base; |