Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz/linux into timers/core

Browse source

Pull the second set of timekeeping things for 4.19 from John Stultz

  * NTP argument clenaups and constification from Ondrej Mosnacek
  * Fix to avoid RTC injecting sleeptime when suspend fails from
    Mukesh Ojha
  * Broading suspsend-timing to include non-stop clocksources that
    aren't currently used for timekeeping from Baolin Wang

...

This commit is contained in:

Thomas Gleixner 2018-07-20 06:43:05 +02:00

parent 3058758925 39232ed5a1

commit e5af5ff34c

8 changed files with 218 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/clocksource.h

View file

2

include/linux/timekeeping.h

View file

149

kernel/time/clocksource.c

View file

17

kernel/time/ntp.c

View file

4

kernel/time/ntp_internal.h

View file

83

kernel/time/timekeeping.c

View file

2

kernel/time/timekeeping_debug.c

View file

2

kernel/time/timekeeping_internal.h

View file