The patch titled
time: make sure sys_gettimeofday() and sys_time() are in sync
has been removed from the -mm tree. Its filename was
time-make-sure-sys_gettimeofday-and-sys_time-are-in.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: time: make sure sys_gettimeofday() and sys_time() are in sync
From: Ingo Molnar <mingo@xxxxxxx>
Make sure sys_gettimeofday() and sys_time() results are coherent.
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/time/timekeeping.c | 13 +++++++++++++
1 files changed, 13 insertions(+)
diff -puN kernel/time/timekeeping.c~time-make-sure-sys_gettimeofday-and-sys_time-are-in kernel/time/timekeeping.c
--- a/kernel/time/timekeeping.c~time-make-sure-sys_gettimeofday-and-sys_time-are-in
+++ a/kernel/time/timekeeping.c
@@ -100,6 +100,19 @@ static inline void __get_realtime_clock_
} while (read_seqretry(&xtime_lock, seq));
timespec_add_ns(ts, nsecs);
+ /*
+ * Make sure xtime.tv_sec [returned by sys_time()] always
+ * follows the gettimeofday() result precisely. This
+ * condition is extremely unlikely, it can hit at most
+ * once per second:
+ */
+ if (unlikely(xtime.tv_sec != ts->tv_sec)) {
+ unsigned long flags;
+
+ write_seqlock_irqsave(&xtime_lock, flags);
+ update_wall_time();
+ write_sequnlock_irqrestore(&xtime_lock, flags);
+ }
}
/**
_
Patches currently in -mm which might be from mingo@xxxxxxx are
origin.patch
only-allow-nonlinear-vmas-for-ram-backed-filesystems.patch
time-make-sure-sys_gettimeofday-and-sys_time-are-in.patch
add-posix-clocks-and-timers-maintainer.patch
fix-raw_spinlock_t-vs-lockdep.patch
lockdep-sanitise-config_prove_locking.patch
lockdep-reduce-the-ifdeffery.patch
lockstat-core-infrastructure.patch
lockstat-human-readability-tweaks.patch
lockstat-hook-into-spinlock_t-rwlock_t-rwsem-and-mutex.patch
lockdep-various-fixes.patch
lockdep-fixup-sk_callback_lock-annotation.patch
lockstat-measure-lock-bouncing.patch
lockstat-better-class-name-representation.patch
lockdep-debugging-give-stacktrace-for-init_error.patch
stacktrace-fix-header-file-for-config_stacktrace.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
