Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 6f7626775acb..280c4fb9b585 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -81,20 +81,12 @@ void uml_idle_timer(void)
         set_interval(ITIMER_REAL);
 }
 
-extern void ktime_get_ts(struct timespec *ts);
-#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)
-
 void time_init(void)
 {
-        struct timespec now;
-
         if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)
                 panic("Couldn't set SIGVTALRM handler");
         set_interval(ITIMER_VIRTUAL);
-
-        do_posix_clock_monotonic_gettime(&now);
-        wall_to_monotonic.tv_sec = -now.tv_sec;
-        wall_to_monotonic.tv_nsec = -now.tv_nsec;
+        time_init_kern();
 }
 
 unsigned long long os_nsecs(void)