diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 00:36:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 00:36:28 +0200 |
| commit | 92ac971219a29336e466921156b16f8fa88d91aa (patch) | |
| tree | 03edb39c77a3811292964c6f836d7710028745a3 | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | lib/vdso: Force inlining of __cvdso_clock_gettime_common() (diff) | |
| download | linux-92ac971219a29336e466921156b16f8fa88d91aa.tar.xz linux-92ac971219a29336e466921156b16f8fa88d91aa.zip | |
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()
| -rw-r--r-- | lib/vdso/gettimeofday.c | 2 |
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) { |