summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-10-20 08:02:39 (GMT)
committerDaniel Lezcano <daniel.lezcano@linaro.org>2015-10-27 00:34:17 (GMT)
commit76b1ba7feda533a74c5874a1d15bb4039083efc8 (patch)
tree154449f362bef9dce42cd4d5c5cc6c2521fa07a5
parentbd859a44b2f6749fd82e89dabbaa37f2c8aa33fe (diff)
downloadlinux-76b1ba7feda533a74c5874a1d15bb4039083efc8.tar.xz
clocksource/drivers/digicolor: 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 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>
-rw-r--r--drivers/clocksource/timer-digicolor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c
index e73947f0f..a536eeb 100644
--- a/drivers/clocksource/timer-digicolor.c
+++ b/drivers/clocksource/timer-digicolor.c
@@ -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));
}