diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 13:00:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-18 13:00:59 -0800 |
| commit | 7ff15cd0458c288afa954de843bb1903c723e5b3 (patch) | |
| tree | ba2cd2cee87452b4d337b8a529b7f8d18b23ad0f /kernel/time/posix-stubs.c | |
| parent | 9e79c5233290884d54addb601afc7ece2f70c79e (diff) | |
| parent | de95a991bb72e009f47e0c4bbc90fc5f594588d5 (diff) | |
| download | linux-7ff15cd0458c288afa954de843bb1903c723e5b3.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Three fixes: fix link failure on Alpha, fix a Sparse warning and
annotate/robustify a lockless access in the NOHZ code"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tick/sched: Annotate lockless access to last_jiffies_update
lib/vdso: Make __cvdso_clock_getres() static
time/posix-stubs: Provide compat itimer supoprt for alpha
Diffstat (limited to 'kernel/time/posix-stubs.c')
| -rw-r--r-- | kernel/time/posix-stubs.c | 3 |
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 |