tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b1e25f41 857505fa

+2
+2
kernel/time/timekeeping.c
··· 962 962 timekeeper.xtime.tv_sec++; 963 963 leap = second_overflow(timekeeper.xtime.tv_sec); 964 964 timekeeper.xtime.tv_sec += leap; 965 + timekeeper.wall_to_monotonic.tv_sec -= leap; 965 966 } 966 967 967 968 /* Accumulate raw time */ ··· 1078 1077 timekeeper.xtime.tv_sec++; 1079 1078 leap = second_overflow(timekeeper.xtime.tv_sec); 1080 1079 timekeeper.xtime.tv_sec += leap; 1080 + timekeeper.wall_to_monotonic.tv_sec -= leap; 1081 1081 } 1082 1082 1083 1083 timekeeping_update(false);