From 27d2e37e7939c708e81f2c046e4f95c7d34fd66c Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 2 May 2005 16:25:10 +1000 Subject: [PATCH] --- yaml --- r: 801 b: refs/heads/master c: ac09f698f1cda91e890fb75f4cb38253d60ff017 h: refs/heads/master i: 799: f267d993491982106bf13a38125be304fb61af44 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 608edc22ef32..0340cc2f50d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e521dca64e0f82d844928c5ee88d82fdced50cbe +refs/heads/master: ac09f698f1cda91e890fb75f4cb38253d60ff017 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index 4fc0cb79f18f..8e561313d094 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/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;