diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/jiffies.c | 1 | ||||
-rw-r--r-- | kernel/timer.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index a99b2a6e6a07..3be8da8fed7e 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c | |||
@@ -62,7 +62,6 @@ struct clocksource clocksource_jiffies = { | |||
62 | .mask = 0xffffffff, /*32bits*/ | 62 | .mask = 0xffffffff, /*32bits*/ |
63 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ | 63 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ |
64 | .shift = JIFFIES_SHIFT, | 64 | .shift = JIFFIES_SHIFT, |
65 | .is_continuous = 0, /* tick based, not free running */ | ||
66 | }; | 65 | }; |
67 | 66 | ||
68 | static int __init init_jiffies_clocksource(void) | 67 | static int __init init_jiffies_clocksource(void) |
diff --git a/kernel/timer.c b/kernel/timer.c index 8f4bf1e6a3ed..1144ff2c2ea3 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -871,7 +871,7 @@ int timekeeping_is_continuous(void) | |||
871 | do { | 871 | do { |
872 | seq = read_seqbegin(&xtime_lock); | 872 | seq = read_seqbegin(&xtime_lock); |
873 | 873 | ||
874 | ret = clock->is_continuous; | 874 | ret = clock->flags & CLOCK_SOURCE_IS_CONTINUOUS; |
875 | 875 | ||
876 | } while (read_seqretry(&xtime_lock, seq)); | 876 | } while (read_seqretry(&xtime_lock, seq)); |
877 | 877 | ||