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

torvalds · torvalds · commit 92ac971219a2 · 2020-06-11T15:36:28.000-07:00
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()
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ static __always_inline int do_coarse(const struct vdso_data *vd, clockid_t clk,`
`210`	`210`	`return 0;`
`211`	`211`	`}`
`212`	`212`
`213`		`-static __maybe_unused int`
	`213`	`+static __always_inline int`
`214`	`214`	`__cvdso_clock_gettime_common(const struct vdso_data *vd, clockid_t clock,`
`215`	`215`	`struct __kernel_timespec *ts)`
`216`	`216`	`{`