3 files changed, 55 insertions, 15 deletions

diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index a20dc8a3c949..fd42bd452b75 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -2,6 +2,55 @@
 # Timer subsystem related configuration options
 #
 
+# Options selectable by arch Kconfig
+
+# Watchdog function for clocksources to detect instabilities
+config CLOCKSOURCE_WATCHDOG
+        bool
+
+# Architecture has extra clocksource data
+config ARCH_CLOCKSOURCE_DATA
+        bool
+
+# Timekeeping vsyscall support
+config GENERIC_TIME_VSYSCALL
+        bool
+
+# ktime_t scalar 64bit nsec representation
+config KTIME_SCALAR
+        bool
+
+# Old style timekeeping
+config ARCH_USES_GETTIMEOFFSET
+        bool
+
+# The generic clock events infrastructure
+config GENERIC_CLOCKEVENTS
+        bool
+
+# Migration helper. Builds, but does not invoke
+config GENERIC_CLOCKEVENTS_BUILD
+        bool
+        default y
+        depends on GENERIC_CLOCKEVENTS
+
+# Clockevents broadcasting infrastructure
+config GENERIC_CLOCKEVENTS_BROADCAST
+        bool
+        depends on GENERIC_CLOCKEVENTS
+
+# Automatically adjust the min. reprogramming time for
+# clock event device
+config GENERIC_CLOCKEVENTS_MIN_ADJUST
+        bool
+
+# Generic update of CMOS clock
+config GENERIC_CMOS_UPDATE
+        bool
+
+if GENERIC_CLOCKEVENTS
+menu "Timers subsystem"
+
 # Core internal switch. Selected by NO_HZ / HIGH_RES_TIMERS. This is
 # only related to the tick functionality. Oneshot clockevent devices
 # are supported independ of this.
@@ -26,10 +75,5 @@ config HIGH_RES_TIMERS
           hardware is not capable then this option only increases
           the size of the kernel image.
 
-config GENERIC_CLOCKEVENTS_BUILD
-        bool
-        default y
-        depends on GENERIC_CLOCKEVENTS
-
-config GENERIC_CLOCKEVENTS_MIN_ADJUST
-        bool
+endmenu
+endif
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index f03fd83b170b..70b33abcc7bb 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -412,6 +412,7 @@ int second_overflow(unsigned long secs)
                 if (secs % 86400 == 0) {
                         leap = -1;
                         time_state = TIME_OOP;
+                        time_tai++;
                         printk(KERN_NOTICE
                                 "Clock: inserting leap second 23:59:60 UTC\n");
                 }
@@ -426,7 +427,6 @@ int second_overflow(unsigned long secs)
                 }
                 break;
         case TIME_OOP:
-                time_tai++;
                 time_state = TIME_WAIT;
                 break;
 
@@ -473,8 +473,6 @@ int second_overflow(unsigned long secs)
                                                          << NTP_SCALE_SHIFT;
         time_adjust = 0;
 
-
-
 out:
         spin_unlock_irqrestore(&ntp_lock, flags);
 
@@ -559,10 +557,10 @@ static inline void process_adj_status(struct timex *txc, struct timespec *ts)
         /* only set allowed bits */
         time_status &= STA_RONLY;
         time_status |= txc->status & ~STA_RONLY;
-
 }
+
 /*
- * Called with the xtime lock held, so we can access and modify
+ * Called with ntp_lock held, so we can access and modify
  * all the global NTP state:
  */
 static inline void process_adjtimex_modes(struct timex *txc, struct timespec *ts)
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d66b21308f7c..6e46cacf5969 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -240,7 +240,6 @@ void getnstimeofday(struct timespec *ts)
 
         timespec_add_ns(ts, nsecs);
 }
-
 EXPORT_SYMBOL(getnstimeofday);
 
 ktime_t ktime_get(void)
@@ -357,8 +356,8 @@ void do_gettimeofday(struct timeval *tv)
         tv->tv_sec = now.tv_sec;
         tv->tv_usec = now.tv_nsec/1000;
 }
-
 EXPORT_SYMBOL(do_gettimeofday);
+
 /**
  * do_settimeofday - Sets the time of day
  * @tv:         pointer to the timespec variable containing the new time
@@ -392,7 +391,6 @@ int do_settimeofday(const struct timespec *tv)
 
         return 0;
 }
-
 EXPORT_SYMBOL(do_settimeofday);