]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
clocksource/drivers/prima2: Prevent ftrace recursion
authorJisheng Zhang <jszhang@marvell.com>
Tue, 20 Oct 2015 08:02:37 +0000 (16:02 +0800)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Tue, 27 Oct 2015 00:33:50 +0000 (01:33 +0100)
commitcdc68ec01853baf3558c6d25f19c869add4a6888
treed6ab66eda4a387d1c2cd8301c2754efaf1ff0037
parentb8725dab66f0b2d57affb33a7f6ca094d9f1f8dd
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>
drivers/clocksource/timer-prima2.c