[PATCH 3/7] clocksource: pistachio: fix ftrace

Jisheng Zhang jszhang at marvell.com
Tue Oct 20 01:02:36 PDT 2015


Currently pistachio can be used as a scheduler clock, we properly marked
pistachio_read_sched_clock() as notrace. But we then call another function
pistachio_clocksource_read_cycles() that _wasn't_ notrace.

This patch fix this by adding notrace attribute to the
pistachio_clocksource_read_cycles() function.

Signed-off-by: Jisheng Zhang <jszhang at marvell.com>
---
 drivers/clocksource/time-pistachio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/time-pistachio.c b/drivers/clocksource/time-pistachio.c
index 18d4266..bba6799 100644
--- a/drivers/clocksource/time-pistachio.c
+++ b/drivers/clocksource/time-pistachio.c
@@ -67,7 +67,8 @@ static inline void gpt_writel(void __iomem *base, u32 value, u32 offset,
 	writel(value, base + 0x20 * gpt_id + offset);
 }
 
-static cycle_t pistachio_clocksource_read_cycles(struct clocksource *cs)
+static cycle_t notrace
+pistachio_clocksource_read_cycles(struct clocksource *cs)
 {
 	struct pistachio_clocksource *pcs = to_pistachio_clocksource(cs);
 	u32 counter, overflw;
-- 
2.6.1




More information about the linux-arm-kernel mailing list