summaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-01-10 21:11:54 +0100
committerThomas Gleixner <tglx@linutronix.de>2020-01-10 21:11:54 +0100
commit2e34d63d820d9071f2390707044e5d5be59cd26c (patch)
tree91cdabe239044108204e8c8d998382b25a049b04 /kernel/time
parent2707745533d6d38fa7d3a2212f1fd599c3879491 (diff)
parentffd08731b2d632459428612431060cf902324a8d (diff)
Merge branch 'timers/urgent' into timers/core
Pick up upstream VDSO fix before adding more VDSO changes.
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/posix-stubs.c3
1 files changed, 3 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