From: Jisheng Zhang <jszhang@marvell.com>
Date: Tue, 20 Oct 2015 08:02:39 +0000 (+0800)
Subject: clocksource/drivers/digicolor: Prevent ftrace recursion
X-Git-Tag: drm-fsl-dcu-for-next~2301^2~1
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=76b1ba7feda533a74c5874a1d15bb4039083efc8;p=linux-drm-fsl-dcu.git

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>
---

diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c
index e73947f0f86d..a536eeb634d8 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));
 }