diff options
-rw-r--r-- | include/linux/time.h | 1 | ||||
-rw-r--r-- | kernel/time/ntp.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index b3061782dec3..97734e9409c6 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -116,7 +116,6 @@ static inline struct timespec timespec_sub(struct timespec lhs, | |||
116 | extern void read_persistent_clock(struct timespec *ts); | 116 | extern void read_persistent_clock(struct timespec *ts); |
117 | extern void read_boot_clock(struct timespec *ts); | 117 | extern void read_boot_clock(struct timespec *ts); |
118 | extern int update_persistent_clock(struct timespec now); | 118 | extern int update_persistent_clock(struct timespec now); |
119 | extern int no_sync_cmos_clock __read_mostly; | ||
120 | void timekeeping_init(void); | 119 | void timekeeping_init(void); |
121 | extern int timekeeping_suspended; | 120 | extern int timekeeping_suspended; |
122 | 121 | ||
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 3d17ebd47fa2..f03fd83b170b 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c | |||
@@ -483,9 +483,6 @@ out: | |||
483 | 483 | ||
484 | #ifdef CONFIG_GENERIC_CMOS_UPDATE | 484 | #ifdef CONFIG_GENERIC_CMOS_UPDATE |
485 | 485 | ||
486 | /* Disable the cmos update - used by virtualization and embedded */ | ||
487 | int no_sync_cmos_clock __read_mostly; | ||
488 | |||
489 | static void sync_cmos_clock(struct work_struct *work); | 486 | static void sync_cmos_clock(struct work_struct *work); |
490 | 487 | ||
491 | static DECLARE_DELAYED_WORK(sync_cmos_work, sync_cmos_clock); | 488 | static DECLARE_DELAYED_WORK(sync_cmos_work, sync_cmos_clock); |
@@ -532,8 +529,7 @@ static void sync_cmos_clock(struct work_struct *work) | |||
532 | 529 | ||
533 | static void notify_cmos_timer(void) | 530 | static void notify_cmos_timer(void) |
534 | { | 531 | { |
535 | if (!no_sync_cmos_clock) | 532 | schedule_delayed_work(&sync_cmos_work, 0); |
536 | schedule_delayed_work(&sync_cmos_work, 0); | ||
537 | } | 533 | } |
538 | 534 | ||
539 | #else | 535 | #else |