Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Tue, 25 Aug 2009 07:32:39 +0900 | From | Paul Mundt <> | Subject | [PATCH -tip] timekeeping: Fix up read_persistent_clock() breakage on sh. |
| |
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(-)
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index 3f4706a..0e0e858 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -41,7 +41,7 @@ int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time; #ifdef CONFIG_GENERIC_CMOS_UPDATE void read_persistent_clock(struct timespec *ts) { - rtc_sh_get_time(&ts); + rtc_sh_get_time(ts); } int update_persistent_clock(struct timespec now)
| ![\](/images/icornerr.gif) |