Commit 9affd6be authored May 07, 2013 by Linus Torvalds

arm: fix mismerge of arch/arm/mach-omap2/timer.c

I badly screwed up the merge in commit 6fa52ed3 ("Merge tag
'drivers-for-linus' of git://git.kernel.org/pub/.../arm-soc"

) by
incorrectly taking the arch/arm/mach-omap2/* data fully from the merge
target because the 'drivers-for-linus' branch seemed to be a proper
superset of the duplicate ARM commits.

That was bogus: commit ff931c82 ("ARM: OMAP: clocks: Delay clk inits
atleast until slab is initialized") only existed in head, and the
changes to arch/arm/mach-omap2/timer.c from that commit got list.

Re-doing the merge more carefully, I do think this part was the only
thing I screwed up.  Knock wood.

Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9607a85b

arch/arm/mach-omap2/timer.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -553,6 +553,8 @@ static inline void __init realtime_counter_init(void)
		clksrc_nr, clksrc_src, clksrc_prop) \
		void __init omap##name##_gptimer_timer_init(void) \
		{ \
		if (omap_clk_init) \
		omap_clk_init(); \
		omap_dmtimer_init(); \
		omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
		omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \
		@@ -563,6 +565,8 @@ void __init omap##name##_gptimer_timer_init(void) \
		clksrc_nr, clksrc_src, clksrc_prop) \
		void __init omap##name##_sync32k_timer_init(void) \
		{ \
		if (omap_clk_init) \
		omap_clk_init(); \
		omap_dmtimer_init(); \
		omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop); \
		/* Enable the use of clocksource="gp_timer" kernel parameter */ \