From 1b7cf45f423f145db4ce464a9cdef8e0c740c5c3 Mon Sep 17 00:00:00 2001
From: Matt Helsley <matthltc@us.ibm.com>
Date: Mon, 9 Jan 2006 20:52:40 -0800
Subject: [PATCH] --- yaml --- r: 17600 b: refs/heads/master c:
 d1c0b8f835aeba85aa428aaec6d521ef4639c7fa h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/time.h |  1 -
 trunk/kernel/time.c        | 22 ----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 3971cb3c7439..670a1b206627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf3c9dc56f5758ca6016513e2790a151bf2077d
+refs/heads/master: d1c0b8f835aeba85aa428aaec6d521ef4639c7fa
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
index 1201155b2202..f2aca7ec6325 100644
--- a/trunk/include/linux/time.h
+++ b/trunk/include/linux/time.h
@@ -80,7 +80,6 @@ extern int do_setitimer(int which, struct itimerval *value,
 			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 --git a/trunk/kernel/time.c b/trunk/kernel/time.c
index cf5a4582a672..169e8329e0b6 100644
--- a/trunk/kernel/time.c
+++ b/trunk/kernel/time.c
@@ -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.