diff options
author | Jisheng Zhang <jszhang@marvell.com> | 2015-10-20 04:02:40 -0400 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-10-26 20:34:07 -0400 |
commit | bd859a44b2f6749fd82e89dabbaa37f2c8aa33fe (patch) | |
tree | b28a06dc5355d944329f3f43837289d0505a5cfc | |
parent | 36361abc8bc14e80f6b4db561665e5e15249c181 (diff) |
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>
-rw-r--r-- | drivers/clocksource/fsl_ftm_timer.c | 2 |
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) | |||
118 | ftm_writel(0x00, base + FTM_CNT); | 118 | ftm_writel(0x00, base + FTM_CNT); |
119 | } | 119 | } |
120 | 120 | ||
121 | static u64 ftm_read_sched_clock(void) | 121 | static u64 notrace ftm_read_sched_clock(void) |
122 | { | 122 | { |
123 | return ftm_readl(priv->clksrc_base + FTM_CNT); | 123 | return ftm_readl(priv->clksrc_base + FTM_CNT); |
124 | } | 124 | } |