Commit ac09f698 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

[PATCH] cpufreq annoying warning fix

The cpufreq core patch I sent earlier got only half-applied.  I added a
flag to let the low level driver disable an annoying warning on
suspend/resume that is normal on ppc, but the "resume" part of it wasn't
applied.

This just adds back that missing bit.  The original patch also reworked
the resume() function to avoid nesting too many if () statements along
the way I did the suspend() one, but I didn't include that in the patch
below.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e521dca6
...@@ -1003,8 +1003,9 @@ static int cpufreq_resume(struct sys_device * sysdev) ...@@ -1003,8 +1003,9 @@ static int cpufreq_resume(struct sys_device * sysdev)
if (unlikely(cur_freq != cpu_policy->cur)) { if (unlikely(cur_freq != cpu_policy->cur)) {
struct cpufreq_freqs freqs; struct cpufreq_freqs freqs;
printk(KERN_WARNING "Warning: CPU frequency is %u, " if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
"cpufreq assumed %u kHz.\n", printk(KERN_WARNING "Warning: CPU frequency"
"is %u, cpufreq assumed %u kHz.\n",
cur_freq, cpu_policy->cur); cur_freq, cpu_policy->cur);
freqs.cpu = cpu; freqs.cpu = cpu;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment