[PATCH] libata ata_data_xfer() fix

[pandora-kernel.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index 96fd0f4..dd5ae11 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -128,7 +128,7 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv, struct timezone __us
  * as real UNIX machines always do it. This avoids all headaches about
  * daylight saving times and warping kernel clocks.
  */
-inline static void warp_clock(void)
+static inline void warp_clock(void)
 {
        write_seqlock_irq(&xtime_lock);
        wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest * 60;
@@ -516,14 +516,6 @@ int do_settimeofday (struct timespec *tv)
 
        write_seqlock_irq(&xtime_lock);
        {
-               /*
-                * This is revolting. We need to set "xtime" correctly. However, the value
-                * in this location is the value at the most recent update of wall time.
-                * Discover what correction gettimeofday would have done, and then undo
-                * it!
-                */
-               nsec -= time_interpolator_get_offset();
-
                wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
                wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);