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

[linux-2.6.git] / kernel / time / timekeeping.c

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index d1aebd73b19146795a4589f6c38ffcf6268c0335..af4135f058254b0607fc2594f2c52ae6355e76b1 100644 (file)
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -170,7 +170,7 @@ void timekeeping_leap_insert(int leapsecond)
 {
        xtime.tv_sec += leapsecond;
        wall_to_monotonic.tv_sec -= leapsecond;
 {
        xtime.tv_sec += leapsecond;
        wall_to_monotonic.tv_sec -= leapsecond;

-       update_vsyscall(&xtime, timekeeper.clock);
+       update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);

 }
 
 #ifdef CONFIG_GENERIC_TIME
 }
 
 #ifdef CONFIG_GENERIC_TIME


@@ -328,7 +328,7 @@ int do_settimeofday(struct timespec *tv)
        timekeeper.ntp_error = 0;
        ntp_clear();
 
        timekeeper.ntp_error = 0;
        ntp_clear();
 

-       update_vsyscall(&xtime, timekeeper.clock);
+       update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);

 
        write_sequnlock_irqrestore(&xtime_lock, flags);
 
 
        write_sequnlock_irqrestore(&xtime_lock, flags);
 


@@ -840,7 +840,7 @@ void update_wall_time(void)
                                timekeeper.ntp_error_shift;
 
        /* check to see if there is a new clocksource to use */
                                timekeeper.ntp_error_shift;
 
        /* check to see if there is a new clocksource to use */

-       update_vsyscall(&xtime, timekeeper.clock);
+       update_vsyscall(&xtime, timekeeper.clock, timekeeper.mult);

 }
 
 /**
 }
 
 /**