From bc731858db6ca0a33a0bc57e64384690d446e27b Mon Sep 17 00:00:00 2001
From: John Stultz <johnstul@us.ibm.com>
Date: Wed, 3 Mar 2010 19:57:22 -0800
Subject: [PATCH] --- yaml --- r: 192221 b: refs/heads/master c:
 6ffdc5774a9ef80e58db398a8307d5b2db2644ce h: refs/heads/master i:   192219:
 675d6a0be34f103b74cc59a37a1f0af8a031f86f v: v3

---
 [refs]                        |  2 +-
 trunk/arch/ia64/kernel/time.c | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index d95e120c6717..d6d65499a3ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2032a4a7237e97cd2ee36e2d806c5742ace189f
+refs/heads/master: 6ffdc5774a9ef80e58db398a8307d5b2db2644ce
diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c
index 47a192781b0a..653b3c46ea82 100644
--- a/trunk/arch/ia64/kernel/time.c
+++ b/trunk/arch/ia64/kernel/time.c
@@ -430,18 +430,16 @@ static int __init rtc_init(void)
 }
 module_init(rtc_init);
 
+void read_persistent_clock(struct timespec *ts)
+{
+	efi_gettimeofday(ts);
+}
+
 void __init
 time_init (void)
 {
 	register_percpu_irq(IA64_TIMER_VECTOR, &timer_irqaction);
-	efi_gettimeofday(&xtime);
 	ia64_init_itm();
-
-	/*
-	 * Initialize wall_to_monotonic such that adding it to xtime will yield zero, the
-	 * tv_nsec field must be normalized (i.e., 0 <= nsec < NSEC_PER_SEC).
-	 */
-	set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
 }
 
 /*