aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-05-02 02:25:10 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-02 11:15:22 -0400
commitac09f698f1cda91e890fb75f4cb38253d60ff017 (patch)
treef71a88464e5b5cb3f5246367bcc8ea0890f5fb0d
parente521dca64e0f82d844928c5ee88d82fdced50cbe (diff)
[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>
-rw-r--r--drivers/cpufreq/cpufreq.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 4fc0cb79f18f..8e561313d094 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1003,9 +1003,10 @@ static int cpufreq_resume(struct sys_device * sysdev)
1003 if (unlikely(cur_freq != cpu_policy->cur)) { 1003 if (unlikely(cur_freq != cpu_policy->cur)) {
1004 struct cpufreq_freqs freqs; 1004 struct cpufreq_freqs freqs;
1005 1005
1006 printk(KERN_WARNING "Warning: CPU frequency is %u, " 1006 if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN))
1007 "cpufreq assumed %u kHz.\n", 1007 printk(KERN_WARNING "Warning: CPU frequency"
1008 cur_freq, cpu_policy->cur); 1008 "is %u, cpufreq assumed %u kHz.\n",
1009 cur_freq, cpu_policy->cur);
1009 1010
1010 freqs.cpu = cpu; 1011 freqs.cpu = cpu;
1011 freqs.old = cpu_policy->cur; 1012 freqs.old = cpu_policy->cur;