diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-04-25 19:24:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-25 20:18:53 -0700 |
| commit | d483389678f9e03d53f226641ea39679debcbc81 (patch) | |
| tree | e33c9e59627e806ef97be9ef66c48afb1e4ab393 /include/vdso/datapage.h | |
| parent | ptp: idt82p33: remove unnecessary comparison (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace (diff) | |
| download | wireguard-linux-d483389678f9e03d53f226641ea39679debcbc81.tar.xz wireguard-linux-d483389678f9e03d53f226641ea39679debcbc81.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Simple overlapping changes to linux/vermagic.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/vdso/datapage.h')
| -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. |