diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-01-10 21:11:54 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-01-10 21:11:54 +0100 |
| commit | 2e34d63d820d9071f2390707044e5d5be59cd26c (patch) | |
| tree | 91cdabe239044108204e8c8d998382b25a049b04 | |
| parent | 2707745533d6d38fa7d3a2212f1fd599c3879491 (diff) | |
| parent | ffd08731b2d632459428612431060cf902324a8d (diff) | |
Merge branch 'timers/urgent' into timers/core
Pick up upstream VDSO fix before adding more VDSO changes.
| -rw-r--r-- | kernel/time/posix-stubs.c | 3 | ||||
| -rw-r--r-- | lib/vdso/gettimeofday.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c index 67df65f887ac..20c65a7d4e3a 100644 --- a/kernel/time/posix-stubs.c +++ b/kernel/time/posix-stubs.c @@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, #ifdef CONFIG_COMPAT COMPAT_SYS_NI(timer_create); +#endif + +#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA) COMPAT_SYS_NI(getitimer); COMPAT_SYS_NI(setitimer); #endif 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); |