From: Jisheng Zhang <jszhang@marvell.com>
Date: Tue, 20 Oct 2015 08:02:38 +0000 (+0800)
Subject: clocksource/drivers/vf_pit_timer: Prevent ftrace recursion
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=36361abc8bc14e80f6b4db561665e5e15249c181;p=openwrt%2Fstaging%2Fblogic.git

clocksource/drivers/vf_pit_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 pit_read_sched_clock() function. Fix this by adding a
notrace attribute to this function.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---

diff --git a/drivers/clocksource/vf_pit_timer.c b/drivers/clocksource/vf_pit_timer.c
index f07ba9932171..a0e6c68536a1 100644
--- a/drivers/clocksource/vf_pit_timer.c
+++ b/drivers/clocksource/vf_pit_timer.c
@@ -52,7 +52,7 @@ static inline void pit_irq_acknowledge(void)
 	__raw_writel(PITTFLG_TIF, clkevt_base + PITTFLG);
 }
 
-static u64 pit_read_sched_clock(void)
+static u64 notrace pit_read_sched_clock(void)
 {
 	return ~__raw_readl(clksrc_base + PITCVAL);
 }