From e9fa653965ec860231b753b96a00c9c6ae18ad86 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 8 Feb 2008 04:19:24 -0800
Subject: [PATCH] --- yaml --- r: 84680 b: refs/heads/master c:
 cf4fc6cb76e50b01666e28a9f4b2e6fbcbb96d5f h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/time.h      | 2 +-
 trunk/kernel/time/tick-sched.c  | 2 +-
 trunk/kernel/time/timekeeping.c | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 326fa6fd1c45..6f58a82253a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b858e6ff9a38b987a83d22e6f2a2f621c80608d
+refs/heads/master: cf4fc6cb76e50b01666e28a9f4b2e6fbcbb96d5f
diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h
index ceaab9fff155..2091a19f1655 100644
--- a/trunk/include/linux/time.h
+++ b/trunk/include/linux/time.h
@@ -120,7 +120,7 @@ extern void getboottime(struct timespec *ts);
 extern void monotonic_to_bootbased(struct timespec *ts);
 
 extern struct timespec timespec_trunc(struct timespec t, unsigned gran);
-extern int timekeeping_is_continuous(void);
+extern int timekeeping_valid_for_hres(void);
 extern void update_wall_time(void);
 extern void update_xtime_cache(u64 nsec);
 
diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c
index 88267f0a8471..fa9bb73dbdb4 100644
--- a/trunk/kernel/time/tick-sched.c
+++ b/trunk/kernel/time/tick-sched.c
@@ -681,7 +681,7 @@ int tick_check_oneshot_change(int allow_nohz)
 	if (ts->nohz_mode != NOHZ_MODE_INACTIVE)
 		return 0;
 
-	if (!timekeeping_is_continuous() || !tick_is_oneshot_available())
+	if (!timekeeping_valid_for_hres() || !tick_is_oneshot_available())
 		return 0;
 
 	if (!allow_nohz)
diff --git a/trunk/kernel/time/timekeeping.c b/trunk/kernel/time/timekeeping.c
index cd5dbc4579c9..4f2637eed0f6 100644
--- a/trunk/kernel/time/timekeeping.c
+++ b/trunk/kernel/time/timekeeping.c
@@ -201,9 +201,9 @@ static inline s64 __get_nsec_offset(void) { return 0; }
 #endif
 
 /**
- * timekeeping_is_continuous - check to see if timekeeping is free running
+ * timekeeping_valid_for_hres - Check if timekeeping is suitable for hres
  */
-int timekeeping_is_continuous(void)
+int timekeeping_valid_for_hres(void)
 {
 	unsigned long seq;
 	int ret;