Merge pull request torvalds#62 from aejsmith/ci20-v3.18-tcu-fix

clocksource: jz47xx-tcu: Mark functions used by sched_clock() as notrace
aejsmith · Aug 3, 2015 · 4da6a16 · 4da6a16
2 parents 6100ad6 + 9562aef
commit 4da6a16
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/drivers/clocksource/jz47xx-tcu.c b/drivers/clocksource/jz47xx-tcu.c
@@ -89,7 +89,7 @@ struct jz47xx_tcu {
 	struct jz47xx_tcu_irq irqs[NUM_TCU_IRQS];
 };
 
-static inline u32 tcu_readl(struct jz47xx_tcu *tcu, enum jz47xx_tcu_reg reg)
+static inline u32 notrace tcu_readl(struct jz47xx_tcu *tcu, enum jz47xx_tcu_reg reg)
 {
 	return readl(tcu->base + reg);
 }
@@ -468,7 +468,7 @@ unsigned jz47xx_tcu_get_channel_rate(struct jz47xx_tcu_channel *channel)
 	return src_rate / div;
 }
 
-u64 jz47xx_tcu_read_channel_count(struct jz47xx_tcu_channel *channel)
+u64 notrace jz47xx_tcu_read_channel_count(struct jz47xx_tcu_channel *channel)
 {
 	struct jz47xx_tcu *tcu = channel->tcu;
 	u64 count;