summaryrefslogtreecommitdiffstats
path: root/kernel/time/ntp.c
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2012-02-11 20:54:59 +0100
committerJohn Stultz <john.stultz@linaro.org>2012-03-24 00:25:20 +0100
commit335dd85895abeca1957d5eaa3013dfe8dc60c7d7 (patch)
tree7ab7ae63376047f6b9fb05b98db6d8ef252c1b5e /kernel/time/ntp.c
parenttime: Avoid scary backtraces when warning of > 11% adj (diff)
downloadlinux-335dd85895abeca1957d5eaa3013dfe8dc60c7d7.tar.xz
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>
Diffstat (limited to 'kernel/time/ntp.c')
-rw-r--r--kernel/time/ntp.c6
1 files changed, 1 insertions, 5 deletions
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