clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion
authorJisheng Zhang <jszhang@marvell.com>
Tue, 20 Oct 2015 08:02:40 +0000 (16:02 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 27 Oct 2015 00:34:07 +0000 (01:34 +0100)
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>
drivers/clocksource/fsl_ftm_timer.c

index ef434699c80a090ee1bbb0de41b38170bddc188b..10202f1fdfd7b2afc6ccf9cd044cecdc2d3d66a7 100644 (file)
@@ -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);
 }