Skip to contentSkip to conversation

timekeeping: Move ktime_get() functions to timekeeping.c

tip:timers/core tip-bot for Thomas Gleixner 1 participant 1 message Jul 7, 2009 Timekeeping, clocksource core, NTP, alarmtimer

lore
Share & tools
lore
#0 lore raw
Commit-ID:  a40f262cc21fbfd781bbddcc40b16b83a75f5f34
Gitweb:     http://git.kernel.org/tip/a40f262cc21fbfd781bbddcc40b16b83a75f5f34
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Tue, 7 Jul 2009 13:00:31 +0200
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Tue, 7 Jul 2009 13:00:31 +0200

timekeeping: Move ktime_get() functions to timekeeping.c

The ktime_get() functions for GENERIC_TIME=n are still located in hrtimer.c. Move them to time/timekeeping.c where they belong.

LKML-Reference: <new-submission>

---
 kernel/hrtimer.c          |   60 ---------------------------------------------
 kernel/time/timekeeping.c |   59 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 62 deletions(-)
kernel/hrtimer.c +0 -60
index 829e066..43d151f 100644
@@ -48,39 +48,6 @@
 
 #include <asm/uaccess.h>
 
-#ifndef CONFIG_GENERIC_TIME
-/**
- * ktime_get - get the monotonic time in ktime_t format
- *
- * returns the time in ktime_t format
- */
-ktime_t ktime_get(void)
-{
-	struct timespec now;
-
-	ktime_get_ts(&now);
-
-	return timespec_to_ktime(now);
-}
-EXPORT_SYMBOL_GPL(ktime_get);
-#endif
-
-/**
- * ktime_get_real - get the real (wall-) time in ktime_t format
- *
- * returns the time in ktime_t format
- */
-ktime_t ktime_get_real(void)
-{
-	struct timespec now;
-
-	getnstimeofday(&now);
-
-	return timespec_to_ktime(now);
-}
-
-EXPORT_SYMBOL_GPL(ktime_get_real);
-
 /*
  * The timer bases:
  *
@@ -108,33 +75,6 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
 	}
 };
 
-#ifndef CONFIG_GENERIC_TIME
-/**
- * ktime_get_ts - get the monotonic clock in timespec format
- * @ts:		pointer to timespec variable
- *
- * The function calculates the monotonic clock from the realtime
- * clock and the wall_to_monotonic offset and stores the result
- * in normalized timespec format in the variable pointed to by @ts.
- */
-void ktime_get_ts(struct timespec *ts)
-{
-	struct timespec tomono;
-	unsigned long seq;
-
-	do {
-		seq = read_seqbegin(&xtime_lock);
-		getnstimeofday(ts);
-		tomono = wall_to_monotonic;
-
-	} while (read_seqretry(&xtime_lock, seq));
-
-	set_normalized_timespec(ts, ts->tv_sec + tomono.tv_sec,
-				ts->tv_nsec + tomono.tv_nsec);
-}
-EXPORT_SYMBOL_GPL(ktime_get_ts);
-#endif
-
 /*
  * Get the coarse grained time at the softirq based on xtime and
  * wall_to_monotonic.
kernel/time/timekeeping.c +57 -2

67 lines not on this page · raw message