Re: [PATCH] cpuidle: Fix build on ARM and SH

[Stephen Rothwell]

Hi Stephen,

Sorry for the delay.

On Wed, 06 Apr 2011 22:57:19 -0700 Stephen Boyd <sboyd@xxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
> 
> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature