Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[deliverable/linux.git] / drivers / cpufreq / intel_pstate.c

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index b76a98dd9988b4f553ddbdd47b663f8720e5fc89..0d159b513469111572c615a2bda79fce5b8ba150 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -449,7 +449,7 @@ static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
                cpu->acpi_perf_data.states[0].core_frequency =
                                        policy->cpuinfo.max_freq / 1000;
        cpu->valid_pss_table = true;
-       pr_info("_PPC limits will be enforced\n");
+       pr_debug("_PPC limits will be enforced\n");
 
        return;
 
@@ -1461,12 +1461,11 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
        intel_pstate_clear_update_util_hook(policy->cpu);
 
        cpu = all_cpu_data[0];
-       if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate) {
-               if (policy->max < policy->cpuinfo.max_freq &&
-                   policy->max > cpu->pstate.max_pstate * cpu->pstate.scaling) {
-                       pr_debug("policy->max > max non turbo frequency\n");
-                       policy->max = policy->cpuinfo.max_freq;
-               }
+       if (cpu->pstate.max_pstate_physical > cpu->pstate.max_pstate &&
+           policy->max < policy->cpuinfo.max_freq &&
+           policy->max > cpu->pstate.max_pstate * cpu->pstate.scaling) {
+               pr_debug("policy->max > max non turbo frequency\n");
+               policy->max = policy->cpuinfo.max_freq;
        }
 
        if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {