---

yaml --- r: 297389 b: refs/heads/master c: 335dd85 h: refs/heads/master i: 297387: 93c89c8 v: v3
git-mirror · Mar 23, 2012 · a23dd45 · a23dd45
1 parent 3afa4d3
commit a23dd45
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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