Skip to content

clocksource / timekeeping rework V4 (resend V3 + bug fix)

Martin Schwidefsky lkml 1 version Applied

Status from this message: applied, thanks! (i fixed the small detail checkpatch complained

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 62 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/15introduce timekeeping_leap_insertinclude/linux/time.h kernel/time/ntp.c kernel/time/timekeeping.c+10 -51 reply
2/15remove clocksource inline functionsinclude/linux/clocksource.h kernel/time/timekeeping.c+28 -711 reply
3/15reset of cycle_last for tsc clocksourcearch/x86/kernel/tsc.c kernel/time/timekeeping.c+6 -11 reply
4/15cleanup clocksource selectionarch/s390/kernel/time.c include/linux/clocksource.h kernel/time/clocksource.c +2 more+65 -894 replies
5/15clocksource watchdog highres enablementkernel/time/clocksource.c+22 -251 reply
6/15clocksource watchdog resume logickernel/time/clocksource.c+15 -81 reply
7/15clocksource watchdog refactoringkernel/time/clocksource.c+69 -281 reply
8/15clocksource watchdog workinclude/linux/clocksource.h kernel/time/clocksource.c+40 -171 reply
9/15introduce struct timekeeperarch/s390/kernel/time.c include/linux/clocksource.h kernel/time/clocksource.c +1 more+162 -1321 reply
10/15add xtime_shift and ntp_error_shift to struct timekeeperkernel/time/timekeeping.c+21 -152 replies
11/15move NTP adjusted clock multiplier to struct timekeeperarch/arm/plat-omap/common.c include/linux/clocksource.h kernel/time/timekeeping.c+27 -371 reply
12/15timekeeper read clock helper functionskernel/time/timekeeping.c+38 -531 reply
13/15update clocksource with stop_machineinclude/linux/clocksource.h kernel/time/clocksource.c kernel/time/timekeeping.c+72 -831 reply
14/15read_persistent_clock should return a timespecarch/m68knommu/kernel/time.c arch/mips/dec/time.c arch/mips/lasat/ds1603.c +13 more+83 -7423 replies
15/15introduce read_boot_clockarch/s390/kernel/time.c include/linux/time.h kernel/time/timekeeping.c+28 -141 reply

Reviews trailers per patch

14 of 15 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJohn StultzThomas Gleixner
SeriesA-b
1/15
2/15A-b A-b
3/15A-b A-b A-b
4/15A-b
5/15A-b
6/15A-b
7/15A-b
8/15A-b
9/15A-b
10/15A-b
11/15A-b
12/15A-b
13/15A-b
14/15A-b
15/15A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [patch 00/15] clocksource / timekeeping rework V4 (resend V3 + bug fix)

Greetings,
version 4 of the clocksource / timekeeping cleanup patches. If you wonder why version 3 did not show up on the mailing list: I had a hiccup with quilt which did strange things to the message ids and the post to lkml got rejected. Sorry for the spamming of the people on Cc.

John pointed out a subtle bug in v3 of the patch set with the reset of the cycle_last value in timekeeping_resume. Fixed in v4.

The latest additions are:
1) Change read_persistent_clock to return a struct timespec instead of an unsigned long with the number of seconds.
2) Introduce read_boot_clock to initialize wall_to_monotonic.
3) Move the reset of cycle_last to zero from the timekeeping code to the TSC code.

The patch set is based on todays upstream tree plus the patches from the tip tree, if anyone wants to try them you need to pull from the master branch of

    git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip

Keeping the fingers crossed that this is now really done. John already gave his thumbs up for the patch series, so the next logical question is who is going to sit on the patches until the merge window is opened? I can certainly create a git branch on git390 for them, but the patches depend on some patches in the x86-tip tree. Thomas, any thoughts?

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.