Commit acd62944 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'timers-urgent-2020-04-25' of git://git.kernel.org/pub/scm/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
parents 05db498a ac84bac4
...@@ -73,8 +73,8 @@ struct vdso_timestamp { ...@@ -73,8 +73,8 @@ struct vdso_timestamp {
* *
* @offset is used by the special time namespace VVAR pages which are * @offset is used by the special time namespace VVAR pages which are
* installed instead of the real VVAR page. These namespace pages must set * 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 * @seq to 1 and @clock_mode to VDSO_CLOCKMODE_TIMENS to force the code into
* time namespace slow path. The namespace aware functions retrieve the * 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. * 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 * For clocks which are not affected by time namespace adjustment the
* offset must be zero. * offset must be zero.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment