Skip to content

Commit

Permalink
clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion
Browse files Browse the repository at this point in the history
Having a traceable function in the sched_clock() path leads to a recursion
within ftrace and a kernel crash.

We should not trace the ftm_read_sched_clock() function.

Fix this by adding the notrace attribute to this function.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Jisheng Zhang authored and Daniel Lezcano committed Oct 27, 2015
1 parent 36361ab commit bd859a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/clocksource/fsl_ftm_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static inline void ftm_reset_counter(void __iomem *base)
ftm_writel(0x00, base + FTM_CNT);
}

static u64 ftm_read_sched_clock(void)
static u64 notrace ftm_read_sched_clock(void)
{
return ftm_readl(priv->clksrc_base + FTM_CNT);
}
Expand Down

0 comments on commit bd859a4

Please sign in to comment.