diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-09 02:08:02 +0300 |
| commit | 4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15 (patch) | |
| tree | 7f162d0612f7048dc52a3ba320a6685593100729 /drivers/cpufreq/intel_pstate.c | |
| parent | b318556479cc923970a79d6c2311138581c0db83 (diff) | |
| parent | 6c9d9c81924b4b63c7a487e90fddb3b2d0f7d458 (diff) | |
| download | linux-4b42fafc1cdc4aba38d4f147cb2f3f1a32cd4a15.tar.xz | |
Merge branch 'pm-cpufreq-sched' into pm-cpufreq
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 8b5a415ee14a..6c7cff13f0ed 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1242,8 +1242,6 @@ static int intel_pstate_init_cpu(unsigned int cpunum) intel_pstate_busy_pid_reset(cpu); - cpu->update_util.func = intel_pstate_update_util; - pr_debug("intel_pstate: controlling: cpu %d\n", cpunum); return 0; @@ -1267,12 +1265,13 @@ static void intel_pstate_set_update_util_hook(unsigned int cpu_num) /* Prevent intel_pstate_update_util() from using stale data. */ cpu->sample.time = 0; - cpufreq_set_update_util_data(cpu_num, &cpu->update_util); + cpufreq_add_update_util_hook(cpu_num, &cpu->update_util, + intel_pstate_update_util); } static void intel_pstate_clear_update_util_hook(unsigned int cpu) { - cpufreq_set_update_util_data(cpu, NULL); + cpufreq_remove_update_util_hook(cpu); synchronize_sched(); } |