Commit 2e34d63d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'timers/urgent' into timers/core 

Pick up upstream VDSO fix before adding more VDSO changes.
parents 27077455 ffd08731

kernel/time/posix-stubs.c

+3 −0
Original line number Diff line number Diff line
@@ -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

lib/vdso/gettimeofday.c

+1 −0
Original line number Diff line number Diff line
@@ -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);