diff options
author | 2020-02-01 21:47:17 +1100 | |
---|---|---|
committer | 2020-02-01 21:47:17 +1100 | |
commit | 4c25df5640ae6e4491ee2c50d3f70c1559ef037d (patch) | |
tree | 9d68b0361918926d7d7b6d78090dcfb942ec4e72 /lib | |
parent | powerpc: configs: Cleanup old Kconfig options (diff) | |
parent | powerpc: Implement user_access_save() and user_access_restore() (diff) | |
download | wireguard-linux-4c25df5640ae6e4491ee2c50d3f70c1559ef037d.tar.xz wireguard-linux-4c25df5640ae6e4491ee2c50d3f70c1559ef037d.zip |
Merge branch 'topic/user-access-begin' into next
Merge the user_access_begin() series from Christophe. This is based on
a commit from Linus that went into v5.5-rc7.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/vdso/gettimeofday.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c index 9ecfd3b547ba..42bd8ab955fa 100644 --- a/lib/vdso/gettimeofday.c +++ b/lib/vdso/gettimeofday.c @@ -221,6 +221,7 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res) return 0; } +static __maybe_unused int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res) { int ret = __cvdso_clock_getres_common(clock, res); |