diff options
author | Linus Torvalds | 2020-04-25 12:16:48 -0700 |
---|---|---|
committer | Linus Torvalds | 2020-04-25 12:16:48 -0700 |
commit | acd629446804617a8fe4700fc4ca16eb44aa4efd (patch) | |
tree | f2c599f192aa7649a8712c654f06742bef277896 | |
parent | 05db498ad94431315c73efe623eab7a7d2d961c6 (diff) | |
parent | ac84bac4062e7fc24f5e2c61c6a414b2a00a29ad (diff) |
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
-rw-r--r-- | include/vdso/datapage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h index 5cbc9fcbfd45..7955c56d6b3c 100644 --- a/include/vdso/datapage.h +++ b/include/vdso/datapage.h @@ -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. |