Commit 92ac9712 authored Jun 11, 2020 by Linus Torvalds

Merge tag 'timers-urgent-2020-06-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A small fix for the VDSO code to force inline
  __cvdso_clock_gettime_common() so the compiler
  can't generate horrible code"

* tag 'timers-urgent-2020-06-11' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  lib/vdso: Force inlining of __cvdso_clock_gettime_common()

parents 623f6dc5 b91c8c42

lib/vdso/gettimeofday.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ static __always_inline int do_coarse(const struct vdso_data *vd, clockid_t clk,
		return 0;
		}

		static __maybe_unused int
		static __always_inline int
		__cvdso_clock_gettime_common(const struct vdso_data *vd, clockid_t clock,
		struct __kernel_timespec *ts)
		{

Admin message