Merge branch 'upstream/core' into upstream/xen
[sfrench/cifs-2.6.git] / arch / x86 / xen / time.c
index e90360ff4a081a5caf33770fa443a7e9e9fc4890..a86df42e46adb27151d4d04205acd7d64e0af716 100644 (file)
@@ -437,6 +437,7 @@ void xen_timer_resume(void)
 __init void xen_time_init(void)
 {
        int cpu = smp_processor_id();
+       struct timespec tp;
 
        clocksource_register(&xen_clocksource);
 
@@ -448,9 +449,8 @@ __init void xen_time_init(void)
        }
 
        /* Set initial system time with full resolution */
-       xen_read_wallclock(&xtime);
-       set_normalized_timespec(&wall_to_monotonic,
-                               -xtime.tv_sec, -xtime.tv_nsec);
+       xen_read_wallclock(&tp);
+       do_settimeofday(&tp);
 
        setup_force_cpu_cap(X86_FEATURE_TSC);