From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Colin Leroy <colin@colino.net>
Cc: Andrew Morton <akpm@osdl.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
"debian-powerpc@lists.debian.org"
<debian-powerpc@lists.debian.org>
Subject: Re: 2.6.12-rc3 cpufreq compile error on ppc32
Date: Fri, 22 Apr 2005 10:17:50 +1000 [thread overview]
Message-ID: <1114129070.5996.36.camel@gaston> (raw)
In-Reply-To: <20050421092611.37df940b@colin.toulouse>
On Thu, 2005-04-21 at 09:26 +0200, Colin Leroy wrote:
> Hi guys,
>
> One of Ben's patches ("ppc32: Fix cpufreq problems") went in 2.6.12-
> rc3, but it depended on another patch that's still in -mm only:
> add-suspend-method-to-cpufreq-core.patch
>
> In addition to this, there's a third patch in -mm that fixes warnings
> and line length to the previous patch, but it doesn't apply cleanly
> anymore. It's named add-suspend-method-to-cpufreq-core-warning-fix.patch
Yup, please, Andrew, get those 2 to Linus.
Ben.
> Here's an updated version. HTH,
>
> Signed-off-by: Colin Leroy <colin@colino.net>
> --- a/drivers/cpufreq/cpufreq.c 2005-04-21 09:14:28.000000000 +0200
> +++ b/drivers/cpufreq/cpufreq.c 2005-04-21 09:18:11.000000000 +0200
> @@ -955,7 +955,6 @@
> {
> int cpu = sysdev->id;
> unsigned int ret = 0;
> - unsigned int cur_freq = 0;
> struct cpufreq_policy *cpu_policy;
>
> dprintk("resuming cpu %u\n", cpu);
> @@ -995,21 +994,24 @@
> cur_freq = cpufreq_driver->get(cpu_policy->cpu);
>
> if (!cur_freq || !cpu_policy->cur) {
> - printk(KERN_ERR "cpufreq: resume failed to assert current frequency is what timing core thinks it is.\n");
> + printk(KERN_ERR "cpufreq: resume failed to assert "
> + "current frequency is what timing core "
> + "thinks it is.\n");
> goto out;
> }
>
> 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);
> + 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;
> freqs.new = cur_freq;
>
> - notifier_call_chain(&cpufreq_transition_notifier_list, CPUFREQ_RESUMECHANGE, &freqs);
> + notifier_call_chain(&cpufreq_transition_notifier_list,
> + CPUFREQ_RESUMECHANGE, &freqs);
> adjust_jiffies(CPUFREQ_RESUMECHANGE, &freqs);
>
> cpu_policy->cur = cur_freq;
>
>
--
Benjamin Herrenschmidt <benh@kernel.crashing.org>
next prev parent reply other threads:[~2005-04-22 0:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-21 7:26 2.6.12-rc3 cpufreq compile error on ppc32 Colin Leroy
2005-04-22 0:17 ` Benjamin Herrenschmidt [this message]
2005-04-25 20:20 ` Colin Leroy
2005-04-29 13:15 ` Christoph Hellwig
2005-04-29 13:26 ` Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1114129070.5996.36.camel@gaston \
--to=benh@kernel.crashing.org \
--cc=akpm@osdl.org \
--cc=colin@colino.net \
--cc=debian-powerpc@lists.debian.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.