diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-08 07:51:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-10 07:23:39 -0500 |
commit | 7645a24cbd01cbf4865d1273d5ddaa8d8c2ccb3a (patch) | |
tree | 60cbc260be0756d14224142b5773e1760557b826 /arch/x86/kernel/cpu/perf_event_intel.c | |
parent | b83a46e7da4a948cc852ba7805dfb1a392dec861 (diff) |
perf, x86: Remove checking_{wr,rd}msr() usage
We don't need checking_{wr,rd}msr() calls, since we should know what cpu
we're running on and not use blindly poke at msrs.
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>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index d3e2424069a..971dc6e7d54 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
@@ -525,7 +525,7 @@ static void intel_pmu_disable_fixed(struct hw_perf_event *hwc) | |||
525 | 525 | ||
526 | rdmsrl(hwc->config_base, ctrl_val); | 526 | rdmsrl(hwc->config_base, ctrl_val); |
527 | ctrl_val &= ~mask; | 527 | ctrl_val &= ~mask; |
528 | (void)checking_wrmsrl(hwc->config_base, ctrl_val); | 528 | wrmsrl(hwc->config_base, ctrl_val); |
529 | } | 529 | } |
530 | 530 | ||
531 | static void intel_pmu_disable_event(struct perf_event *event) | 531 | static void intel_pmu_disable_event(struct perf_event *event) |
@@ -553,7 +553,6 @@ static void intel_pmu_enable_fixed(struct hw_perf_event *hwc) | |||
553 | { | 553 | { |
554 | int idx = hwc->idx - X86_PMC_IDX_FIXED; | 554 | int idx = hwc->idx - X86_PMC_IDX_FIXED; |
555 | u64 ctrl_val, bits, mask; | 555 | u64 ctrl_val, bits, mask; |
556 | int err; | ||
557 | 556 | ||
558 | /* | 557 | /* |
559 | * Enable IRQ generation (0x8), | 558 | * Enable IRQ generation (0x8), |
@@ -578,7 +577,7 @@ static void intel_pmu_enable_fixed(struct hw_perf_event *hwc) | |||
578 | rdmsrl(hwc->config_base, ctrl_val); | 577 | rdmsrl(hwc->config_base, ctrl_val); |
579 | ctrl_val &= ~mask; | 578 | ctrl_val &= ~mask; |
580 | ctrl_val |= bits; | 579 | ctrl_val |= bits; |
581 | err = checking_wrmsrl(hwc->config_base, ctrl_val); | 580 | wrmsrl(hwc->config_base, ctrl_val); |
582 | } | 581 | } |
583 | 582 | ||
584 | static void intel_pmu_enable_event(struct perf_event *event) | 583 | static void intel_pmu_enable_event(struct perf_event *event) |