Commit cdc68ec0 authored Oct 20, 2015 by Jisheng Zhang Committed by Daniel Lezcano Oct 27, 2015

clocksource/drivers/prima2: Prevent ftrace recursion



Currently prima2 timer can be used as a scheduler clock. We properly
marked sirfsoc_read_sched_clock() as notrace but we then call another
function sirfsoc_timer_read() that _wasn't_ notrace.

Having a traceable function in the sched_clock() path leads to a recursion
within ftrace and a kernel crash.

Fix this by adding notrace attribute to the sirfsoc_timer_read() function.

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

parent b8725dab

drivers/clocksource/timer-prima2.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
	}		}

	/* read 64-bit timer counter */		/* read 64-bit timer counter */
	static cycle_t sirfsoc_timer_read(struct clocksource *cs)		static cycle_t notrace sirfsoc_timer_read(struct clocksource *cs)
	{		{
	u64 cycles;		u64 cycles;