summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJisheng Zhang <jszhang@marvell.com>2015-10-20 10:02:35 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2015-10-27 01:33:41 +0100
commitb8725dab66f0b2d57affb33a7f6ca094d9f1f8dd (patch)
treed779fcf6254908910c93f63f3d18d101559798fa
parentclocksource/drivers/pistachio: Prevent ftrace recursion (diff)
downloadlinux-b8725dab66f0b2d57affb33a7f6ca094d9f1f8dd.tar.xz
linux-b8725dab66f0b2d57affb33a7f6ca094d9f1f8dd.zip
clocksource/drivers/samsung_pwm_timer: Prevent ftrace recursion
Currently samsung_pwm_timer can be used as a scheduler clock. We properly marked samsung_read_sched_clock() as notrace but we then call another function samsung_clocksource_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 samsung_clocksource_read() function. Signed-off-by: Jisheng Zhang <jszhang@marvell.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/samsung_pwm_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index bc90e13338cc..9502bc4c3f6d 100644
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -307,7 +307,7 @@ static void samsung_clocksource_resume(struct clocksource *cs)
samsung_time_start(pwm.source_id, true);
}
-static cycle_t samsung_clocksource_read(struct clocksource *c)
+static cycle_t notrace samsung_clocksource_read(struct clocksource *c)
{
return ~readl_relaxed(pwm.source_reg);
}