diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:12:11 +0200 |
| commit | b0338e99b2a775c157e3e795f49fdcfb6c257f7a (patch) | |
| tree | 59573cd20718ebb5145b05938ef3fb428bde65c7 /arch/x86/kernel/cpu/perf_event.c | |
| parent | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (diff) | |
| parent | 715c85b1fc824e9cd0ea07d6ceb80d2262f32e90 (diff) | |
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.c')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 69d5feadab2..e677d9923f4 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -211,7 +211,7 @@ static bool check_hw_exists(void) * that don't trap on the MSR access and always return 0s. */ val = 0xabcdUL; - ret = checking_wrmsrl(x86_pmu_event_addr(0), val); + ret = wrmsrl_safe(x86_pmu_event_addr(0), val); ret |= rdmsrl_safe(x86_pmu_event_addr(0), &val_new); if (ret || val != val_new) goto msr_fail; |