Skip to content

Commit

Permalink
clocksource/drivers/vf_pit_timer: Prevent ftrace recursion
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jisheng Zhang authored and Daniel Lezcano committed Oct 27, 2015
1 parent cdc68ec commit 36361ab
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/clocksource/vf_pit_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 36361ab

Please sign in to comment.