summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-11 15:36:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-11 15:36:28 -0700
commit92ac971219a29336e466921156b16f8fa88d91aa (patch)
tree03edb39c77a3811292964c6f836d7710028745a3 /lib
parent623f6dc593eaf98b91916836785278eddddaacf8 (diff)
parentb91c8c42ffdd5c983923edb38b3c3e112bfe6263 (diff)
downloadlinux-92ac971219a29336e466921156b16f8fa88d91aa.tar.bz2
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()
Diffstat (limited to 'lib')
-rw-r--r--lib/vdso/gettimeofday.c2
1 files changed, 1 insertions, 1 deletions
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)
{