]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clocksource/drivers/digicolor: Prevent ftrace recursion
authorJisheng Zhang <jszhang@marvell.com>
Tue, 20 Oct 2015 08:02:39 +0000 (16:02 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 27 Oct 2015 00:34:17 +0000 (01:34 +0100)
Having a traceable function in the sched_clock() path leads to a recursion
within ftrace and a kernel crash.

We should not trace digicolor_timer_sched_read() function. Fix this by adding
the notrace attribute to this function.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
drivers/clocksource/timer-digicolor.c

index e73947f0f86db3c1b9656c9b3418c9151f7f2954..a536eeb634d885fccf5b92f0d0cbeeec7f88baf2 100644 (file)
@@ -143,7 +143,7 @@ static irqreturn_t digicolor_timer_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static u64 digicolor_timer_sched_read(void)
+static u64 notrace digicolor_timer_sched_read(void)
 {
        return ~readl(dc_timer_dev.base + COUNT(TIMER_B));
 }