From c5fc38cfae713c85bc5eb571a7747783d157d12e Mon Sep 17 00:00:00 2001
From: John Stultz <johnstul@us.ibm.com>
Date: Thu, 11 Mar 2010 14:11:39 -0800
Subject: [PATCH] --- yaml --- r: 192215 b: refs/heads/master c:
 104f9c471ffb425fd081074ef31521b38d77592a h: refs/heads/master i:   192213:
 286f60e19e8856d804be61558bfa117916aeafd0   192211:
 07d06fa2b84e605c6a1b73f5131f972c6368baa7   192207:
 2d6e1a450daaa89e5f3b4c9eb0bd3e6ed47a92ed v: v3

---
 [refs]                          | 2 +-
 trunk/arch/xtensa/kernel/time.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 54b31465a081..cbc8648f1ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4507257764ae0387f0d8c2ca57808f37e4c9439
+refs/heads/master: 104f9c471ffb425fd081074ef31521b38d77592a
diff --git a/trunk/arch/xtensa/kernel/time.c b/trunk/arch/xtensa/kernel/time.c
index 19f7df30937f..19df764f6399 100644
--- a/trunk/arch/xtensa/kernel/time.c
+++ b/trunk/arch/xtensa/kernel/time.c
@@ -60,11 +60,6 @@ static struct irqaction timer_irqaction = {
 
 void __init time_init(void)
 {
-	/* 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);
-
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 	printk("Calibrating CPU frequency ");
 	platform_calibrate_ccount();