From: Matt Helsley Remove getnstimestamp() in favor of ktime.h's ktime_get_ts() Signed-off-by: Matt Helsley Cc: john stultz Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton --- include/linux/time.h | 1 - kernel/time.c | 22 ---------------------- 2 files changed, 23 deletions(-) diff -puN include/linux/time.h~remove-getnstimestamp include/linux/time.h --- 25/include/linux/time.h~remove-getnstimestamp Thu Dec 15 15:33:21 2005 +++ 25-akpm/include/linux/time.h Thu Dec 15 15:33:21 2005 @@ -80,7 +80,6 @@ extern int do_setitimer(int which, struc struct itimerval *ovalue); extern int do_getitimer(int which, struct itimerval *value); extern void getnstimeofday(struct timespec *tv); -extern void getnstimestamp(struct timespec *ts); extern struct timespec timespec_trunc(struct timespec t, unsigned gran); diff -puN kernel/time.c~remove-getnstimestamp kernel/time.c --- 25/kernel/time.c~remove-getnstimestamp Thu Dec 15 15:33:21 2005 +++ 25-akpm/kernel/time.c Thu Dec 15 15:33:21 2005 @@ -564,28 +564,6 @@ void getnstimeofday(struct timespec *tv) EXPORT_SYMBOL_GPL(getnstimeofday); #endif -void getnstimestamp(struct timespec *ts) -{ - unsigned int seq; - struct timespec wall2mono; - - /* synchronize with settimeofday() changes */ - do { - seq = read_seqbegin(&xtime_lock); - getnstimeofday(ts); - wall2mono = wall_to_monotonic; - } while(unlikely(read_seqretry(&xtime_lock, seq))); - - /* adjust to monotonicaly-increasing values */ - ts->tv_sec += wall2mono.tv_sec; - ts->tv_nsec += wall2mono.tv_nsec; - while (unlikely(ts->tv_nsec >= NSEC_PER_SEC)) { - ts->tv_nsec -= NSEC_PER_SEC; - ts->tv_sec++; - } -} -EXPORT_SYMBOL_GPL(getnstimestamp); - /* Converts Gregorian date to seconds since 1970-01-01 00:00:00. * Assumes input in normal date format, i.e. 1980-12-31 23:59:59 * => year=1980, mon=12, day=31, hour=23, min=59, sec=59. _