The following commit has been merged into the timers/core branch of tip:
Commit-ID: 25a2a6567829119f5e3e11eb0ce3d8ae985b6019
Gitweb: https://git.kernel.org/tip/25a2a6567829119f5e3e11eb0ce3d8ae985b6019
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Fri, 07 Feb 2020 13:38:52 +01:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Mon, 17 Feb 2020 14:40:21 +01:00
MIPS: vdso: Compile high resolution parts conditionally
If neither the R4K nor the GIC timer is enabled in the kernel configuration
then let the core VDSO code drop the high resolution parts at compile time.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
Link: https://lkml.kernel.org/r/20200207124402.714585315@xxxxxxxxxxxxx
---
arch/mips/include/asm/vdso/gettimeofday.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
index a58687e..a9f846b 100644
--- a/arch/mips/include/asm/vdso/gettimeofday.h
+++ b/arch/mips/include/asm/vdso/gettimeofday.h
@@ -199,6 +199,13 @@ static __always_inline u64 __arch_get_hw_counter(s32 clock_mode)
return cycle_now;
}
+static inline bool mips_vdso_hres_capable(void)
+{
+ return IS_ENABLED(CONFIG_CSRC_R4K) ||
+ IS_ENABLED(CONFIG_CLKSRC_MIPS_GIC);
+}
+#define __arch_vdso_hres_capable mips_vdso_hres_capable
+
static __always_inline const struct vdso_data *__arch_get_vdso_data(void)
{
return get_vdso_data();
|