mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull leap second timer fix from Thomas Gleixner. * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
This commit is contained in:
commit
b1e25f4109
1 changed files with 2 additions and 0 deletions
|
@ -962,6 +962,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift)
|
||||||
timekeeper.xtime.tv_sec++;
|
timekeeper.xtime.tv_sec++;
|
||||||
leap = second_overflow(timekeeper.xtime.tv_sec);
|
leap = second_overflow(timekeeper.xtime.tv_sec);
|
||||||
timekeeper.xtime.tv_sec += leap;
|
timekeeper.xtime.tv_sec += leap;
|
||||||
|
timekeeper.wall_to_monotonic.tv_sec -= leap;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Accumulate raw time */
|
/* Accumulate raw time */
|
||||||
|
@ -1077,6 +1078,7 @@ static void update_wall_time(void)
|
||||||
timekeeper.xtime.tv_sec++;
|
timekeeper.xtime.tv_sec++;
|
||||||
leap = second_overflow(timekeeper.xtime.tv_sec);
|
leap = second_overflow(timekeeper.xtime.tv_sec);
|
||||||
timekeeper.xtime.tv_sec += leap;
|
timekeeper.xtime.tv_sec += leap;
|
||||||
|
timekeeper.wall_to_monotonic.tv_sec -= leap;
|
||||||
}
|
}
|
||||||
|
|
||||||
timekeeping_update(false);
|
timekeeping_update(false);
|
||||||
|
|
Loading…
Reference in a new issue