Merge branch 'timers/urgent' into timers/core

Pick up upstream VDSO fix before adding more VDSO changes.
2020-01-10 21:11:54 +01:00
parent 2707745533 ffd08731b2
commit 2e34d63d82
2 changed files with 4 additions and 0 deletions
--- 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