diff options
author | Robert Richter <robert.richter@amd.com> | 2010-03-01 08:21:23 -0500 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-03-01 08:21:23 -0500 |
commit | bb1165d6882f423f90fc7007a88c6c993b7c2ac4 (patch) | |
tree | 8ae1578c6d6ae548d1336cca86831e921f6236d3 /arch/x86/kernel/cpu/perf_event.c | |
parent | a163b1099dc7016704043c7fc572ae42519f08f7 (diff) |
perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE
For consistency reasons this patch renames
ARCH_PERFMON_EVENTSEL0_ENABLE to ARCH_PERFMON_EVENTSEL_ENABLE.
The following is performed:
$ sed -i -e s/ARCH_PERFMON_EVENTSEL0_ENABLE/ARCH_PERFMON_EVENTSEL_ENABLE/g \
arch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event.c \
arch/x86/kernel/cpu/perf_event_p6.c \
arch/x86/kernel/cpu/perfctr-watchdog.c \
arch/x86/oprofile/op_model_amd.c arch/x86/oprofile/op_model_ppro.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 641ccb9dddbc..6531b4bdb22d 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
@@ -553,9 +553,9 @@ static void x86_pmu_disable_all(void) | |||
553 | if (!test_bit(idx, cpuc->active_mask)) | 553 | if (!test_bit(idx, cpuc->active_mask)) |
554 | continue; | 554 | continue; |
555 | rdmsrl(x86_pmu.eventsel + idx, val); | 555 | rdmsrl(x86_pmu.eventsel + idx, val); |
556 | if (!(val & ARCH_PERFMON_EVENTSEL0_ENABLE)) | 556 | if (!(val & ARCH_PERFMON_EVENTSEL_ENABLE)) |
557 | continue; | 557 | continue; |
558 | val &= ~ARCH_PERFMON_EVENTSEL0_ENABLE; | 558 | val &= ~ARCH_PERFMON_EVENTSEL_ENABLE; |
559 | wrmsrl(x86_pmu.eventsel + idx, val); | 559 | wrmsrl(x86_pmu.eventsel + idx, val); |
560 | } | 560 | } |
561 | } | 561 | } |
@@ -590,7 +590,7 @@ static void x86_pmu_enable_all(void) | |||
590 | continue; | 590 | continue; |
591 | 591 | ||
592 | val = event->hw.config; | 592 | val = event->hw.config; |
593 | val |= ARCH_PERFMON_EVENTSEL0_ENABLE; | 593 | val |= ARCH_PERFMON_EVENTSEL_ENABLE; |
594 | wrmsrl(x86_pmu.eventsel + idx, val); | 594 | wrmsrl(x86_pmu.eventsel + idx, val); |
595 | } | 595 | } |
596 | } | 596 | } |
@@ -853,7 +853,7 @@ void hw_perf_enable(void) | |||
853 | static inline void __x86_pmu_enable_event(struct hw_perf_event *hwc, int idx) | 853 | static inline void __x86_pmu_enable_event(struct hw_perf_event *hwc, int idx) |
854 | { | 854 | { |
855 | (void)checking_wrmsrl(hwc->config_base + idx, | 855 | (void)checking_wrmsrl(hwc->config_base + idx, |
856 | hwc->config | ARCH_PERFMON_EVENTSEL0_ENABLE); | 856 | hwc->config | ARCH_PERFMON_EVENTSEL_ENABLE); |
857 | } | 857 | } |
858 | 858 | ||
859 | static inline void x86_pmu_disable_event(struct hw_perf_event *hwc, int idx) | 859 | static inline void x86_pmu_disable_event(struct hw_perf_event *hwc, int idx) |