diff options
| author | Cesar Eduardo Barros <cesarb@cesarb.net> | 2012-02-11 17:54:59 -0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2012-03-23 16:25:20 -0700 |
| commit | 335dd85895abeca1957d5eaa3013dfe8dc60c7d7 (patch) | |
| tree | 7ab7ae63376047f6b9fb05b98db6d8ef252c1b5e | |
| parent | e919cfd42da54d400e7e0385f22cae3672dcf874 (diff) | |
| download | linux-335dd85895abeca1957d5eaa3013dfe8dc60c7d7.tar.gz linux-335dd85895abeca1957d5eaa3013dfe8dc60c7d7.tar.bz2 linux-335dd85895abeca1957d5eaa3013dfe8dc60c7d7.zip | |
time: remove no_sync_cmos_clock
Commit 9863c90f682fba34cdc26c3437e8c00da6c83fa4 (x86, vmware: Remove
deprecated VMI kernel support) removed the only place which set
no_sync_cmos_clock. Since that commit, this variable is never set.
Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -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, extern void read_persistent_clock(struct timespec *ts); extern void read_boot_clock(struct timespec *ts); extern int update_persistent_clock(struct timespec now); -extern int no_sync_cmos_clock __read_mostly; void timekeeping_init(void); extern int timekeeping_suspended; 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: #ifdef CONFIG_GENERIC_CMOS_UPDATE -/* Disable the cmos update - used by virtualization and embedded */ -int no_sync_cmos_clock __read_mostly; - static void sync_cmos_clock(struct work_struct *work); static DECLARE_DELAYED_WORK(sync_cmos_work, sync_cmos_clock); @@ -532,8 +529,7 @@ static void sync_cmos_clock(struct work_struct *work) static void notify_cmos_timer(void) { - if (!no_sync_cmos_clock) - schedule_delayed_work(&sync_cmos_work, 0); + schedule_delayed_work(&sync_cmos_work, 0); } #else |