summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-10-20 11:02:40 +0300
committerDaniel Lezcano <daniel.lezcano@linaro.org>2015-10-27 03:34:07 +0300
commitbd859a44b2f6749fd82e89dabbaa37f2c8aa33fe (patch)
treeb28a06dc5355d944329f3f43837289d0505a5cfc /drivers/clocksource
parent36361abc8bc14e80f6b4db561665e5e15249c181 (diff)
downloadlinux-bd859a44b2f6749fd82e89dabbaa37f2c8aa33fe.tar.xz
clocksource/drivers/fsl_ftm_timer: Prevent ftrace recursion
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>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/fsl_ftm_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c
index ef434699c80a..10202f1fdfd7 100644
--- a/drivers/clocksource/fsl_ftm_timer.c
+++ b/drivers/clocksource/fsl_ftm_timer.c
@@ -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);
}