Re: [ 045/218] ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER

[Greg Kroah-Hartman]

On Mon, Oct 01, 2012 at 03:53:04PM -0300, Herton Ronaldo Krzesinski wrote:
> On Mon, Oct 01, 2012 at 11:33:43AM -0700, Greg Kroah-Hartman wrote:
> > On Mon, Oct 01, 2012 at 03:20:46PM -0300, Herton Ronaldo Krzesinski wrote:
> > > On Fri, Sep 28, 2012 at 01:14:22PM -0700, Greg Kroah-Hartman wrote:
> > > > 3.4-stable review patch.  If anyone has any objections, please let me know.
> > > > 
> > > > ------------------
> > > > 
> > > > From: Igor Grinberg <grinberg@xxxxxxxxxxxxxx>
> > > > 
> > > > commit 45caae74d238ef6583e9402cb8c550cc0b0f7dbd upstream.
> > > > 
> > > > Currently, omap2_sync32k_clocksource_init() function initializes the 32K
> > > > timer as the system clock source regardless of the CONFIG_OMAP_32K_TIMER
> > > > setting.
> > > > Fix this by providing a default implementation for
> > > > !CONFIG_OMAP_32K_TIMER case.
> > > > 
> > > > Signed-off-by: Igor Grinberg <grinberg@xxxxxxxxxxxxxx>
> > > > Reviewed-by: Paul Walmsley <paul@xxxxxxxxx>
> > > > Acked-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> > > > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> > > > 
> > > > ---
> > > >  arch/arm/mach-omap2/timer.c |    7 +++++++
> > > >  1 file changed, 7 insertions(+)
> > > 
> > > Build failure with this patch:
> > > 
> > > linux/arch/arm/mach-omap2/timer.c:308:2: error: #else after #else
> > > linux/arch/arm/mach-omap2/timer.c:238:0: error: the conditional began here
> > > linux/arch/arm/mach-omap2/timer.c:326:21: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:326:24: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:326:27: error: expected declaration specifiers or '...' before string constant
> > > linux/arch/arm/mach-omap2/timer.c:326:47: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:326:50: error: expected declaration specifiers or '...' before string constant
> > > linux/arch/arm/mach-omap2/timer.c:328:21: error: invalid suffix "_secure" on integer constant
> > > linux/arch/arm/mach-omap2/timer.c:328:21: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:328:31: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:328:51: error: expected declaration specifiers or '...' before string constant
> > > linux/arch/arm/mach-omap2/timer.c:329:4: error: expected declaration specifiers or '...' before numeric constant
> > > linux/arch/arm/mach-omap2/timer.c:329:7: error: expected declaration specifiers or '...' before string constant
> > 
> > Does it also fail in Linus's tree?  Was there a follow-on patch that
> > fixed the build issues?
> 
> I only saw the build failure, and proposed 3.5.5 which have the same patch
> builds fine. It looks like this patch isn't applicable to 3.4 (that seems to be
> fixing a problem in commit 1fe97c8f).

Ah, nice catch, I'll go drop this patch from the 3.4-stable queue,
thanks for letting me know.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/