Messages in this thread | | | Date | Tue, 25 Aug 2009 08:44:58 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH -tip] timekeeping: Fix up read_persistent_clock() breakage on sh. |
| |
* Paul Mundt <lethal@linux-sh.org> wrote:
> The recent commit "timekeeping: Increase granularity of > read_persistent_clock()" introduced read_persistent_clock() rework which > inadvertently broke the sh conversion: > > arch/sh/kernel/time.c:45: error: passing argument 1 of 'rtc_sh_get_time' from incompatible pointer type > distcc[13470] ERROR: compile arch/sh/kernel/time.c on sprygo/32 failed > make[2]: *** [arch/sh/kernel/time.o] Error 1 > > This trivial fix gets it working again. > > Signed-off-by: Paul Mundt <lethal@linux-sh.org> > Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> > Cc: Ingo Molnar <mingo@elte.hu> > > --- > > arch/sh/kernel/time.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
applied, thanks Paul!
I'm wondering, why did my cross-build of the SH defconfig in the timer tree not catch this? All i get (and got) are these warnings:
/home/mingo/tip/arch/sh/kernel/cpu/clock-cpg.c: In function 'cpg_clk_init': /home/mingo/tip/arch/sh/kernel/cpu/clock-cpg.c:242: warning: 'arch_init_clk_ops' is deprecated (declared at /home/mingo/tip/arch/sh/include/asm/clock.h:58) /home/mingo/tip/arch/sh/kernel/cpu/clock-cpg.c: In function 'arch_clk_init': /home/mingo/tip/arch/sh/kernel/cpu/clock-cpg.c:256: warning: 'cpg_clk_init' is deprecated (declared at /home/mingo/tip/arch/sh/kernel/cpu/clock-cpg.c:237)
and time.o built without errors or warnings:
CC arch/sh/kernel/time.o
Ingo
| |