Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1251411

[PATCH 4/7] clocksource: prima2: fix ftrace

From Jisheng Zhang <jszhang@marvell.com>
Newsgroups linux.kernel
Subject [PATCH 4/7] clocksource: prima2: fix ftrace
Date 2015-10-20 10:10 +0200
Message-ID <qlA9A-6df-7@gated-at.bofh.it> (permalink)
References <qlA9z-6df-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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.

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

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 drivers/clocksource/timer-prima2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index 78de982..2854c66 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -73,7 +73,7 @@ static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
 }
 
 /* read 64-bit timer counter */
-static cycle_t sirfsoc_timer_read(struct clocksource *cs)
+static cycle_t notrace sirfsoc_timer_read(struct clocksource *cs)
 {
 	u64 cycles;
 
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread


Thread

[PATCH 4/7] clocksource: prima2: fix ftrace Jisheng Zhang <jszhang@marvell.com> - 2015-10-20 10:10 +0200

csiph-web