Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / x86 / xen / time.c

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 0d3f07c..b3c6c59 100644 (file)
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -13,6 +13,7 @@
 #include <linux/clockchips.h>
 #include <linux/kernel_stat.h>
 #include <linux/math64.h>
+#include <linux/gfp.h>
 
 #include <asm/pvclock.h>
 #include <asm/xen/hypervisor.h>
@@ -475,6 +476,7 @@ void xen_timer_resume(void)
 __init void xen_time_init(void)
 {
        int cpu = smp_processor_id();
+       struct timespec tp;
 
        clocksource_register(&xen_clocksource);
 
@@ -486,9 +488,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);