qiurui
/
Ubuntu-focal-kernel
mirror of https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib/vdso: Make __arch_update_vdso_data() logic understandable 

BugLink: https://bugs.launchpad.net/bugs/1866333

commit 9a6b55ac4a upstream.

The function name suggests that this is a boolean checking whether the
architecture asks for an update of the VDSO data, but it works the other
way round. To spare further confusion invert the logic.

Fixes: 44f57d788e ("timekeeping: Provide a generic update_vsyscall() implementation")
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200114185946.656652824@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Thomas Gleixner 2020-01-14 19:52:38 +01:00 committed by Paolo Pisati
parent 20ba527a31
commit b6884ec37e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm-generic/vdso/vsyscall.h
View File

@ -12,9 +12,9 @@ static __always_inline struct vdso_data *__arch_get_k_vdso_data(void)
#endif /* __arch_get_k_vdso_data */
#ifndef __arch_update_vdso_data
static __always_inline int __arch_update_vdso_data(void)
static __always_inline bool __arch_update_vdso_data(void)
{
return 0;
return true;
}
#endif /* __arch_update_vdso_data */

2
kernel/time/vsyscall.c
View File

@ -84,7 +84,7 @@ void update_vsyscall(struct timekeeper *tk)
struct vdso_timestamp *vdso_ts;
u64 nsec;
if (__arch_update_vdso_data()) {
if (!__arch_update_vdso_data()) {
/*
* Some architectures might want to skip the update of the
* data page.