diff options
| author | John Stultz <johnstul@us.ibm.com> | 2009-08-14 15:47:18 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-15 10:55:45 +0200 |
| commit | 31089c13bcb18d2cd2a3ddfbe3a28666346f237e (patch) | |
| tree | 9db4868a4c524efd6f927a555e43c009a70243a5 /kernel/time/timekeeping.c | |
| parent | 4cd1993f0046fbc765dbf20af90966f5661e3789 (diff) | |
| download | kernel-common-31089c13bcb18d2cd2a3ddfbe3a28666346f237e.tar.gz kernel-common-31089c13bcb18d2cd2a3ddfbe3a28666346f237e.tar.bz2 kernel-common-31089c13bcb18d2cd2a3ddfbe3a28666346f237e.zip | |
timekeeping: Introduce timekeeping_leap_insert
Move the adjustment of xtime, wall_to_monotonic and the update of the
vsyscall variables to the timekeeping code.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
LKML-Reference: <20090814134807.609730216@de.ibm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 02c0b2c9c674..b8b70fb545fc 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -58,6 +58,13 @@ void update_xtime_cache(u64 nsec) struct clocksource *clock; +/* must hold xtime_lock */ +void timekeeping_leap_insert(int leapsecond) +{ + xtime.tv_sec += leapsecond; + wall_to_monotonic.tv_sec -= leapsecond; + update_vsyscall(&xtime, clock); +} #ifdef CONFIG_GENERIC_TIME /** |