Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Fix read_persistent_clock fallout
  kgdb: Do not access xtime directly
  powerpc: Clean up obsolete code relating to decrementer and timebase
  powerpc: Rework VDSO gettimeofday to prevent time going backwards
  clocksource: Add __clocksource_updatefreq_hz/khz methods
  x86: Convert common clocksources to use clocksource_register_hz/khz
  timekeeping: Make xtime and wall_to_monotonic static
  hrtimer: Cleanup direct access to wall_to_monotonic
  um: Convert to use read_persistent_clock
  timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset
  powerpc: Cleanup xtime usage
  powerpc: Simplify update_vsyscall
  time: Kill off CONFIG_GENERIC_TIME
  time: Implement timespec_add
  x86: Fix vtime/file timestamp inconsistencies

Trivial conflicts in Documentation/feature-removal-schedule.txt

Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as
per Thomas' earlier merge commit 47916be4e28c ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")

1 files changed, 27 insertions, 33 deletions

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index ccb8759c8532..ce53dfa7130d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -796,10 +796,30 @@ static cycle_t timebase_read(struct clocksource *cs)
         return (cycle_t)get_tb();
 }
 
-static inline void update_gtod(u64 new_tb_stamp, u64 new_stamp_xsec,
-                               u64 new_tb_to_xs, struct timespec *now,
-                               u32 frac_sec)
+void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
+                        struct clocksource *clock, u32 mult)
 {
+        u64 new_tb_to_xs, new_stamp_xsec;
+        u32 frac_sec;
+
+        if (clock != &clocksource_timebase)
+                return;
+
+        /* Make userspace gettimeofday spin until we're done. */
+        ++vdso_data->tb_update_count;
+        smp_mb();
+
+        /* XXX this assumes clock->shift == 22 */
+        /* 4611686018 ~= 2^(20+64-22) / 1e9 */
+        new_tb_to_xs = (u64) mult * 4611686018ULL;
+        new_stamp_xsec = (u64) wall_time->tv_nsec * XSEC_PER_SEC;
+        do_div(new_stamp_xsec, 1000000000);
+        new_stamp_xsec += (u64) wall_time->tv_sec * XSEC_PER_SEC;
+
+        BUG_ON(wall_time->tv_nsec >= NSEC_PER_SEC);
+        /* this is tv_nsec / 1e9 as a 0.32 fraction */
+        frac_sec = ((u64) wall_time->tv_nsec * 18446744073ULL) >> 32;
+
         /*
          * tb_update_count is used to allow the userspace gettimeofday code
          * to assure itself that it sees a consistent view of the tb_to_xs and
@@ -811,43 +831,17 @@ static inline void update_gtod(u64 new_tb_stamp, u64 new_stamp_xsec,
          * We expect the caller to have done the first increment of
          * vdso_data->tb_update_count already.
          */
-        vdso_data->tb_orig_stamp = new_tb_stamp;
+        vdso_data->tb_orig_stamp = clock->cycle_last;
         vdso_data->stamp_xsec = new_stamp_xsec;
         vdso_data->tb_to_xs = new_tb_to_xs;
-        vdso_data->wtom_clock_sec = wall_to_monotonic.tv_sec;
-        vdso_data->wtom_clock_nsec = wall_to_monotonic.tv_nsec;
-        vdso_data->stamp_xtime = *now;
+        vdso_data->wtom_clock_sec = wtm->tv_sec;
+        vdso_data->wtom_clock_nsec = wtm->tv_nsec;
+        vdso_data->stamp_xtime = *wall_time;
         vdso_data->stamp_sec_fraction = frac_sec;
         smp_wmb();
         ++(vdso_data->tb_update_count);
 }
 
-void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
-                     u32 mult)
-{
-        u64 t2x, stamp_xsec;
-        u32 frac_sec;
-
-        if (clock != &clocksource_timebase)
-                return;
-
-        /* Make userspace gettimeofday spin until we're done. */
-        ++vdso_data->tb_update_count;
-        smp_mb();
-
-        /* XXX this assumes clock->shift == 22 */
-        /* 4611686018 ~= 2^(20+64-22) / 1e9 */
-        t2x = (u64) mult * 4611686018ULL;
-        stamp_xsec = (u64) wall_time->tv_nsec * XSEC_PER_SEC;
-        do_div(stamp_xsec, 1000000000);
-        stamp_xsec += (u64) wall_time->tv_sec * XSEC_PER_SEC;
-
-        BUG_ON(wall_time->tv_nsec >= NSEC_PER_SEC);
-        /* this is tv_nsec / 1e9 as a 0.32 fraction */
-        frac_sec = ((u64) wall_time->tv_nsec * 18446744073ULL) >> 32;
-        update_gtod(clock->cycle_last, stamp_xsec, t2x, wall_time, frac_sec);
-}
-
 void update_vsyscall_tz(void)
 {
         /* Make userspace gettimeofday spin until we're done. */