Skip to content

Commit

Permalink
Merge tag 'timers-urgent-2020-04-25' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…linux/kernel/git/tip/tip

Pull timer fixlet from Ingo Molnar:
 "A single fix for a comment that may show up in DocBook output"

* tag 'timers-urgent-2020-04-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  vdso/datapage: Use correct clock mode name in comment
  • Loading branch information
torvalds committed Apr 25, 2020
2 parents 05db498 + ac84bac commit acd6294
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/vdso/datapage.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ struct vdso_timestamp {
*
* @offset is used by the special time namespace VVAR pages which are
* installed instead of the real VVAR page. These namespace pages must set
* @seq to 1 and @clock_mode to VLOCK_TIMENS to force the code into the
* time namespace slow path. The namespace aware functions retrieve the
* @seq to 1 and @clock_mode to VDSO_CLOCKMODE_TIMENS to force the code into
* the time namespace slow path. The namespace aware functions retrieve the
* real system wide VVAR page, read host time and add the per clock offset.
* For clocks which are not affected by time namespace adjustment the
* offset must be zero.
Expand Down

0 comments on commit acd6294

Please sign in to comment.