diff --git a/[refs] b/[refs] index 59c4e80d2e02..bf47032ba9d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e919cfd42da54d400e7e0385f22cae3672dcf874 +refs/heads/master: 335dd85895abeca1957d5eaa3013dfe8dc60c7d7 diff --git a/trunk/include/linux/time.h b/trunk/include/linux/time.h index b3061782dec3..97734e9409c6 100644 --- a/trunk/include/linux/time.h +++ b/trunk/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/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 3d17ebd47fa2..f03fd83b170b 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -483,9 +483,6 @@ int second_overflow(unsigned long secs) #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