aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 6bbdc16cc69f..fa6541d781bc 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -498,7 +498,7 @@ static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
498 * To be called with the counter disabled in hw: 498 * To be called with the counter disabled in hw:
499 */ 499 */
500static void 500static void
501__hw_perf_counter_set_period(struct perf_counter *counter, 501x86_perf_counter_set_period(struct perf_counter *counter,
502 struct hw_perf_counter *hwc, int idx) 502 struct hw_perf_counter *hwc, int idx)
503{ 503{
504 s64 left = atomic64_read(&hwc->period_left); 504 s64 left = atomic64_read(&hwc->period_left);
@@ -642,7 +642,7 @@ try_generic:
642 */ 642 */
643 barrier(); 643 barrier();
644 644
645 __hw_perf_counter_set_period(counter, hwc, idx); 645 x86_perf_counter_set_period(counter, hwc, idx);
646 __x86_pmu_enable(counter, hwc, idx); 646 __x86_pmu_enable(counter, hwc, idx);
647 647
648 return 0; 648 return 0;
@@ -731,7 +731,7 @@ static void perf_save_and_restart(struct perf_counter *counter)
731 int idx = hwc->idx; 731 int idx = hwc->idx;
732 732
733 x86_perf_counter_update(counter, hwc, idx); 733 x86_perf_counter_update(counter, hwc, idx);
734 __hw_perf_counter_set_period(counter, hwc, idx); 734 x86_perf_counter_set_period(counter, hwc, idx);
735 735
736 if (counter->state == PERF_COUNTER_STATE_ACTIVE) 736 if (counter->state == PERF_COUNTER_STATE_ACTIVE)
737 __x86_pmu_enable(counter, hwc, idx); 737 __x86_pmu_enable(counter, hwc, idx);