diff options
-rw-r--r-- | include/linux/time.h | 2 | ||||
-rw-r--r-- | kernel/time/tick-sched.c | 2 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index ceaab9fff155..2091a19f1655 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -120,7 +120,7 @@ extern void getboottime(struct timespec *ts); | |||
120 | extern void monotonic_to_bootbased(struct timespec *ts); | 120 | extern void monotonic_to_bootbased(struct timespec *ts); |
121 | 121 | ||
122 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); | 122 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); |
123 | extern int timekeeping_is_continuous(void); | 123 | extern int timekeeping_valid_for_hres(void); |
124 | extern void update_wall_time(void); | 124 | extern void update_wall_time(void); |
125 | extern void update_xtime_cache(u64 nsec); | 125 | extern void update_xtime_cache(u64 nsec); |
126 | 126 | ||
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 88267f0a8471..fa9bb73dbdb4 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -681,7 +681,7 @@ int tick_check_oneshot_change(int allow_nohz) | |||
681 | if (ts->nohz_mode != NOHZ_MODE_INACTIVE) | 681 | if (ts->nohz_mode != NOHZ_MODE_INACTIVE) |
682 | return 0; | 682 | return 0; |
683 | 683 | ||
684 | if (!timekeeping_is_continuous() || !tick_is_oneshot_available()) | 684 | if (!timekeeping_valid_for_hres() || !tick_is_oneshot_available()) |
685 | return 0; | 685 | return 0; |
686 | 686 | ||
687 | if (!allow_nohz) | 687 | if (!allow_nohz) |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index cd5dbc4579c9..4f2637eed0f6 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -201,9 +201,9 @@ static inline s64 __get_nsec_offset(void) { return 0; } | |||
201 | #endif | 201 | #endif |
202 | 202 | ||
203 | /** | 203 | /** |
204 | * timekeeping_is_continuous - check to see if timekeeping is free running | 204 | * timekeeping_valid_for_hres - Check if timekeeping is suitable for hres |
205 | */ | 205 | */ |
206 | int timekeeping_is_continuous(void) | 206 | int timekeeping_valid_for_hres(void) |
207 | { | 207 | { |
208 | unsigned long seq; | 208 | unsigned long seq; |
209 | int ret; | 209 | int ret; |