From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Boyd <sboyd@codeaurora.org>
Cc: Len Brown <len.brown@intel.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Kevin Hilman <khilman@deeprootsystems.com>,
Paul Mundt <lethal@linux-sh.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] cpuidle: Fix build on ARM and SH
Date: Fri, 15 Apr 2011 14:08:21 +1000 [thread overview]
Message-ID: <20110415140821.ca2b727d.sfr@canb.auug.org.au> (raw)
In-Reply-To: <4D9D523F.4090506@codeaurora.org>
[-- Attachment #1: Type: text/plain, Size: 2165 bytes --]
Hi Stephen,
Sorry for the delay.
On Wed, 06 Apr 2011 22:57:19 -0700 Stephen Boyd <sboyd@codeaurora.org> wrote:
>
> On 4/3/2011 10:23 PM, Mark Brown wrote:
> > Commit 5f8cf82 (cpuidle: stop using pm_idle) converted arches to use
> > cpuidle_idle_call() but contained typos on ARM and SH transposing the
> > function name into cpuidle_call_idle().
> >
> > Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> When will this patch get into linux-next? Every ARM and SH build has
> failed for the past 3 days presumably due to this. Stephen, can you pick
> it up for the time being?
>
> > ---
> > arch/arm/kernel/process.c | 2 +-
> > arch/sh/kernel/idle.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
> > index dc9d685..f47660e 100644
> > --- a/arch/arm/kernel/process.c
> > +++ b/arch/arm/kernel/process.c
> > @@ -197,7 +197,7 @@ void cpu_idle(void)
> > cpu_relax();
> > } else {
> > stop_critical_timings();
> > - if (cpuidle_call_idle())
> > + if (cpuidle_idle_call())
> > pm_idle();
> > start_critical_timings();
> > /*
> > diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
> > index 9c7099e..1db1968 100644
> > --- a/arch/sh/kernel/idle.c
> > +++ b/arch/sh/kernel/idle.c
> > @@ -101,7 +101,7 @@ void cpu_idle(void)
> > local_irq_disable();
> > /* Don't trace irqs off for idle */
> > stop_critical_timings();
> > - if (cpuidle_call_idle())
> > + if (cpuidle_idle_call())
> > pm_idle();
> > /*
> > * Sanity check to ensure that pm_idle() returns
I fished the patch of LKML and have applied it from today. However, I
think SH may need a further patch for this errors:
arch/sh/kernel/idle.c:25: error: static declaration of 'pm_idle' follows non-static declaration
include/linux/pm.h:34: error: previous declaration of 'pm_idle' was here
Len, can you please get these fixed up in your idle-test tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-04-15 4:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 5:23 [PATCH] cpuidle: Fix build on ARM and SH Mark Brown
2011-04-07 5:57 ` Stephen Boyd
2011-04-15 4:08 ` Stephen Rothwell [this message]
2011-04-04 5:27 Mark Brown
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=20110415140821.ca2b727d.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=khilman@deeprootsystems.com \
--cc=len.brown@intel.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@codeaurora.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).