diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-05-02 16:25:10 +1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-02 08:15:22 -0700 |
| commit | ac09f698f1cda91e890fb75f4cb38253d60ff017 (patch) | |
| tree | f71a88464e5b5cb3f5246367bcc8ea0890f5fb0d /drivers | |
| parent | e521dca64e0f82d844928c5ee88d82fdced50cbe (diff) | |
| download | linux-3.10-ac09f698f1cda91e890fb75f4cb38253d60ff017.tar.gz linux-3.10-ac09f698f1cda91e890fb75f4cb38253d60ff017.tar.bz2 linux-3.10-ac09f698f1cda91e890fb75f4cb38253d60ff017.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 4fc0cb79f18..8e561313d09 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1003,9 +1003,10 @@ static int cpufreq_resume(struct sys_device * sysdev) if (unlikely(cur_freq != cpu_policy->cur)) { struct cpufreq_freqs freqs; - printk(KERN_WARNING "Warning: CPU frequency is %u, " - "cpufreq assumed %u kHz.\n", - cur_freq, cpu_policy->cur); + if (!(cpufreq_driver->flags & CPUFREQ_PM_NO_WARN)) + printk(KERN_WARNING "Warning: CPU frequency" + "is %u, cpufreq assumed %u kHz.\n", + cur_freq, cpu_policy->cur); freqs.cpu = cpu; freqs.old = cpu_policy->cur; |