Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / xtensa / kernel / time.c

diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 8848120d291bc7465d9a4fcdf2b07aee7ae9c394..19085ff0484a27df21142c14a3fcc5384b4497a6 100644 (file)
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -59,9 +59,8 @@ static struct irqaction timer_irqaction = {
 
 void __init time_init(void)
 {
-       xtime.tv_nsec = 0;
-       xtime.tv_sec = read_persistent_clock();
-
+       /* FIXME: xtime&wall_to_monotonic are set in timekeeping_init. */
+       read_persistent_clock(&xtime);
        set_normalized_timespec(&wall_to_monotonic,
                -xtime.tv_sec, -xtime.tv_nsec);