| Message ID | 20210410181117.23967-1-eantoranz@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] arm64: vdso: correct definition of macro vdso_clocksource_ok | expand |
Hi Edmundo, On Sat, 10 Apr 2021 19:11:17 +0100, Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote: > > 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. No difference? Have you simply tried removing the macro and witness the effect? If it made no difference, why have the macro at all then? Also, run this, for example: git grep '^\#define' arch/arm64/include/asm/| awk '$2 == $3 { print }' Are you going to "fix" these too? Thanks, M.
On Sat, Apr 10, 2021 at 1:03 PM Marc Zyngier <maz@kernel.org> wrote: > > Hi Edmundo, Sup! > > > No difference? Have you simply tried removing the macro and witness > the effect? If it made no difference, why have the macro at all then? Oh, come on! so having the macro defined so that you can do things like lib/vdso/gettimeofday.c:34:#ifndef vdso_clocksource_ok counts as "a difference" to you? XD ok ok ... so, I have deleted "extended linux kernel C preprocessor knowledge" from my linkedin profile. I can safely assume that this is a big resounding NACK, right? :-D > > Also, run this, for example: > > git grep '^\#define' arch/arm64/include/asm/| awk '$2 == $3 { print }' > > Are you going to "fix" these too? > > Thanks, Thank you for the lesson, man. Still have a lot of stuff to learn in front of me. Pura vida!
On Sat, 10 Apr 2021 20:58:22 +0100, Edmundo Carmona Antoranz <eantoranz@gmail.com> wrote: > > On Sat, Apr 10, 2021 at 1:03 PM Marc Zyngier <maz@kernel.org> wrote: > > > > Hi Edmundo, > > Sup! > > > > > > > No difference? Have you simply tried removing the macro and witness > > the effect? If it made no difference, why have the macro at all then? > > Oh, come on! so having the macro defined so that you can do things like > > lib/vdso/gettimeofday.c:34:#ifndef vdso_clocksource_ok > > counts as "a difference" to you? XD ok ok ... so, I have deleted > "extended linux kernel C preprocessor knowledge" from my linkedin > profile. If you want to look cool on Linkedin, the C preprocessor really is the wrong thing to boast about. Consider adding things like iron oxide, which will definitely boost your visibility. > I can safely assume that this is a big resounding NACK, right? :-D Not necessarily a NAK, because I don't like doing that. But I find this an unnecessarily change and a fairly pointless divergence from an established practice. Others may agree with you. But it was worth pointing out that "it actually makes no difference to have the macro defined or not" wasn't quite the right thing to put in the commit message. > > > > > Also, run this, for example: > > > > git grep '^\#define' arch/arm64/include/asm/| awk '$2 == $3 { print }' > > > > Are you going to "fix" these too? > > > > Thanks, > > Thank you for the lesson, man. Still have a lot of stuff to learn in > front of me. We all do. M.
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__ */
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@gmail.com> --- arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)