Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Benjamin Herrenschmidt and committed by
Linus Torvalds
ac09f698 e521dca6

+4 -3
+4 -3
drivers/cpufreq/cpufreq.c
··· 1003 1003 if (unlikely(cur_freq != cpu_policy->cur)) { 1004 1004 struct cpufreq_freqs freqs; 1005 1005 1006 - printk(KERN_WARNING "Warning: CPU frequency is %u, " 1007 - "cpufreq assumed %u kHz.\n", 1008 - cur_freq, cpu_policy->cur); 1006 + if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN)) 1007 + printk(KERN_WARNING "Warning: CPU frequency" 1008 + "is %u, cpufreq assumed %u kHz.\n", 1009 + cur_freq, cpu_policy->cur); 1009 1010 1010 1011 freqs.cpu = cpu; 1011 1012 freqs.old = cpu_policy->cur;