From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Thu, 4 Oct 2012 22:46:57 +0000 (-0700)
Subject: Revert "timekeeping: Maintain ktime_t based offsets for hrtimers"
X-Git-Tag: v2.6.39-400.9.0~303^2~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=425f64f299d1cb53a4fb5d688ff86d6aa919e1c4;p=users%2Fjedix%2Flinux-maple.git

Revert "timekeeping: Maintain ktime_t based offsets for hrtimers"

This reverts commit d37953b2e9a6a9b4619dc68613b4d1a5cb6afbf3.

Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index ca5f67ed39696..49975d598d3ef 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -161,26 +161,11 @@ static struct timespec xtime __attribute__ ((aligned (16)));
 static struct timespec wall_to_monotonic __attribute__ ((aligned (16)));
 static struct timespec total_sleep_time;
 
-/* Offset clock monotonic -> clock realtime */
-static ktime_t offs_real;
-
-/* Offset clock monotonic -> clock boottime */
-static ktime_t offs_boot;
-
 /*
  * The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock.
  */
 static struct timespec raw_time;
 
-/* must hold write on xtime_lock */
-static void update_rt_offset(void)
-{
-	struct timespec tmp, *wtm = &wall_to_monotonic;
-
-	set_normalized_timespec(&tmp, -wtm->tv_sec, -wtm->tv_nsec);
-	offs_real = timespec_to_ktime(tmp);
-}
-
 /* must hold write on xtime_lock */
 static void timekeeping_update(bool clearntp)
 {
@@ -188,7 +173,6 @@ static void timekeeping_update(bool clearntp)
 		timekeeper.ntp_error = 0;
 		ntp_clear();
 	}
-	update_rt_offset();
 	update_vsyscall(&xtime, &wall_to_monotonic,
 			 timekeeper.clock, timekeeper.mult);
 }
@@ -612,7 +596,6 @@ void __init timekeeping_init(void)
 	}
 	set_normalized_timespec(&wall_to_monotonic,
 				-boot.tv_sec, -boot.tv_nsec);
-	update_rt_offset();
 	total_sleep_time.tv_sec = 0;
 	total_sleep_time.tv_nsec = 0;
 	write_sequnlock_irqrestore(&xtime_lock, flags);
@@ -621,12 +604,6 @@ void __init timekeeping_init(void)
 /* time in seconds when suspend began */
 static struct timespec timekeeping_suspend_time;
 
-static void update_sleep_time(struct timespec t)
-{
-	total_sleep_time = t;
-	offs_boot = timespec_to_ktime(t);
-}
-
 /**
  * __timekeeping_inject_sleeptime - Internal function to add sleep interval
  * @delta: pointer to a timespec delta value
@@ -638,7 +615,7 @@ static void __timekeeping_inject_sleeptime(struct timespec *delta)
 {
 	xtime = timespec_add(xtime, *delta);
 	wall_to_monotonic = timespec_sub(wall_to_monotonic, *delta);
-	update_sleep_time(timespec_add(total_sleep_time, *delta));
+	total_sleep_time = timespec_add(total_sleep_time, *delta);
 }