[PATCH -next] arm64: vdso: correct definition of macro vdso_clocksource_ok

Edmundo Carmona Antoranz eantoranz at gmail.com
Sat Apr 10 19:11:17 BST 2021


The macro vdso_clocksource_ok is shadowing a function with the same
name and so it actually makes no difference to have the macro defined
or not. Take a hint from x86, rename the function to have the
arch_ prefix and correct the definition of the macro.

Signed-off-by: Edmundo Carmona Antoranz <eantoranz at gmail.com>
---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
index 7508b0ac1d21..055d9e42a05d 100644
--- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h
+++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h
@@ -166,11 +166,11 @@ static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void)
 }
 #endif
 
-static inline bool vdso_clocksource_ok(const struct vdso_data *vd)
+static inline bool arch_vdso_clocksource_ok(const struct vdso_data *vd)
 {
 	return vd->clock_mode == VDSO_CLOCKMODE_ARCHTIMER;
 }
-#define vdso_clocksource_ok	vdso_clocksource_ok
+#define vdso_clocksource_ok arch_vdso_clocksource_ok
 
 #endif /* !__ASSEMBLY__ */
 
-- 
2.20.1




More information about the linux-arm-kernel mailing list