[GIT pull] timers/urgent for v5.8

[Thomas Gleixner]

Linus,

please pull the latest timers/urgent branch from:

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

up to:  b91c8c42ffdd: lib/vdso: Force inlining of __cvdso_clock_gettime_common()


A small fix for the VDSO code to force inline
__cvdso_clock_gettime_common() so the compiler can't generate horrible
code.

Thanks,

	tglx

------------------>
Christophe Leroy (1):
      lib/vdso: Force inlining of __cvdso_clock_gettime_common()


 lib/vdso/gettimeofday.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c
index a2909af4b924..7938d3c4901d 100644
--- a/lib/vdso/gettimeofday.c
+++ b/lib/vdso/gettimeofday.c
@@ -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)
 {