---

yaml --- r: 147386 b: refs/heads/rpi-3.18.y c: 26816c2 h: refs/heads/rpi-3.18.y
bootc · Apr 29, 2009 · b71ff00 · b71ff00
1 parent 0de1c19
commit b71ff00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/rpi-3.18.y: dee5d9067ca78b317538fd67930be4e09a83dbc5
+refs/heads/rpi-3.18.y: 26816c287e13eedc67bc4ed0cd40c138314b7c7d
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -498,7 +498,7 @@ static DEFINE_PER_CPU(u64, prev_left[X86_PMC_IDX_MAX]);
  * To be called with the counter disabled in hw:
  */
 static void
-__hw_perf_counter_set_period(struct perf_counter *counter,
+x86_perf_counter_set_period(struct perf_counter *counter,
  struct hw_perf_counter *hwc, int idx)
 {
  s64 left = atomic64_read(&hwc->period_left);
@@ -642,7 +642,7 @@ static int x86_pmu_enable(struct perf_counter *counter)
  */
  barrier();
 
- __hw_perf_counter_set_period(counter, hwc, idx);
+ x86_perf_counter_set_period(counter, hwc, idx);
  __x86_pmu_enable(counter, hwc, idx);
 
  return 0;
@@ -731,7 +731,7 @@ static void perf_save_and_restart(struct perf_counter *counter)
  int idx = hwc->idx;
 
  x86_perf_counter_update(counter, hwc, idx);
- __hw_perf_counter_set_period(counter, hwc, idx);
+ x86_perf_counter_set_period(counter, hwc, idx);
 
  if (counter->state == PERF_COUNTER_STATE_ACTIVE)
  __x86_pmu_enable(counter, hwc, idx);