xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'timers/urgent' into timers/core

Browse Source 
Pick up upstream VDSO fix before adding more VDSO changes.
This commit is contained in:
Thomas Gleixner
2020-01-10 21:11:54 +01:00
parent 2707745533 ffd08731b2
commit 2e34d63d82
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/time/posix-stubs.c
View File

@@ -151,6 +151,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
COMPAT_SYS_NI(timer_create); COMPAT_SYS_NI(timer_create);
#endif
#if defined(CONFIG_COMPAT) || defined(CONFIG_ALPHA)
COMPAT_SYS_NI(getitimer); COMPAT_SYS_NI(getitimer);
COMPAT_SYS_NI(setitimer); COMPAT_SYS_NI(setitimer);
#endif #endif

1
lib/vdso/gettimeofday.c
View File

@@ -221,6 +221,7 @@ int __cvdso_clock_getres_common(clockid_t clock, struct __kernel_timespec *res)
return 0; return 0;
} }
static __maybe_unused
int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res) int __cvdso_clock_getres(clockid_t clock, struct __kernel_timespec *res)
{ {
int ret = __cvdso_clock_getres_common(clock, res); int ret = __cvdso_clock_getres_common(clock, res);