The following commit has been merged into the timers/core branch of tip: Commit-ID: bf127df3cceada8693888fc86a3121c38ef25701 Gitweb: https://git.kernel.org/tip/bf127df3cceada8693888fc86a3121c38ef25701 Author: Nathan Chancellor <nathan@xxxxxxxxxx> AuthorDate: Thu, 03 Mar 2022 11:42:12 -07:00 Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> CommitterDate: Mon, 07 Mar 2022 18:27:22 +01:00 clocksource/drivers/imx-tpm: Move tpm_read_sched_clock() under CONFIG_ARM When building this driver for an architecture other than ARCH=arm: drivers/clocksource/timer-imx-tpm.c:78:20: error: unused function 'tpm_read_sched_clock' [-Werror,-Wunused-function] static u64 notrace tpm_read_sched_clock(void) ^ 1 error generated. Move the function definition under the existing CONFIG_ARM section so there is no more warning. Fixes: 10720e120e2b ("clocksource/drivers/imx-tpm: Exclude sched clock for ARM64") Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx> Reviewed-by: Peng Fan <peng.fan@xxxxxxx> Link: https://lore.kernel.org/r/20220303184212.2356245-1-nathan@xxxxxxxxxx Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> --- drivers/clocksource/timer-imx-tpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-imx-tpm.c b/drivers/clocksource/timer-imx-tpm.c index 60cefc2..bd64a8a 100644 --- a/drivers/clocksource/timer-imx-tpm.c +++ b/drivers/clocksource/timer-imx-tpm.c @@ -73,12 +73,12 @@ static unsigned long tpm_read_current_timer(void) { return tpm_read_counter(); } -#endif static u64 notrace tpm_read_sched_clock(void) { return tpm_read_counter(); } +#endif static int tpm_set_next_event(unsigned long delta, struct clock_event_device *evt)
![]() |