]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clocksource/drivers/vf_pit_timer: Prevent ftrace recursion
authorJisheng Zhang <jszhang@marvell.com>
Tue, 20 Oct 2015 08:02:38 +0000 (16:02 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 27 Oct 2015 00:33:58 +0000 (01:33 +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 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>
drivers/clocksource/vf_pit_timer.c

index f07ba99321716c02628affeafca70100642a1df2..a0e6c68536a18d8dbc76eb7f239bea31ca24240f 100644 (file)
@@ -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);
 }