From: Guangyu Sun <guangyu.sun@oracle.com>
Date: Thu, 4 Oct 2012 22:46:57 +0000 (-0700)
Subject: Revert "timekeeping: Provide hrtimer update function"
X-Git-Tag: v2.6.39-400.9.0~303^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3842f46c84c4016711dd74d769aa336b5dc59552;p=users%2Fjedix%2Flinux-maple.git

Revert "timekeeping: Provide hrtimer update function"

This reverts commit 21d5fbe769e6e2456feba3d350ee721f4d7dddab.

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

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index cc07d2777bbe..c9ec9400ee5b 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -327,7 +327,6 @@ extern ktime_t ktime_get(void);
 extern ktime_t ktime_get_real(void);
 extern ktime_t ktime_get_boottime(void);
 extern ktime_t ktime_get_monotonic_offset(void);
-extern ktime_t ktime_get_update_offsets(ktime_t *offs_real, ktime_t *offs_boot);
 
 DECLARE_PER_CPU(struct tick_device, tick_cpu_device);
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 6e2fe34c8b78..ca5f67ed3969 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1135,40 +1135,6 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
 	} while (read_seqretry(&xtime_lock, seq));
 }
 
-#ifdef CONFIG_HIGH_RES_TIMERS
-/**
- * ktime_get_update_offsets - hrtimer helper
- * @real:	pointer to storage for monotonic -> realtime offset
- * @_boot:	pointer to storage for monotonic -> boottime offset
- *
- * Returns current monotonic time and updates the offsets
- * Called from hrtimer_interupt() or retrigger_next_event()
- */
-ktime_t ktime_get_update_offsets(ktime_t *real, ktime_t *boot)
-{
-	ktime_t now;
-	unsigned int seq;
-	u64 secs, nsecs;
-
-	do {
-		seq = read_seqbegin(&xtime_lock);
-
-		secs = xtime.tv_sec;
-		nsecs = xtime.tv_nsec;
-		nsecs += timekeeping_get_ns();
-		/* If arch requires, add in gettimeoffset() */
-		nsecs += arch_gettimeoffset();
-
-		*real = offs_real;
-		*boot = offs_boot;
-	} while (read_seqretry(&xtime_lock, seq));
-
-	now = ktime_add_ns(ktime_set(secs, 0), nsecs);
-	now = ktime_sub(now, *real);
-	return now;
-}
-#endif
-
 /**
  * ktime_get_monotonic_offset() - get wall_to_monotonic in ktime_t format
  */