Commit f31e98bf authored by Anders Roxell's avatar Anders Roxell Committed by Will Deacon

arm64: arch_timer: mark functions as __always_inline

If CONFIG_FUNCTION_GRAPH_TRACER is enabled function
arch_counter_get_cntvct() is marked as notrace. However, function
__arch_counter_get_cntvct is marked as inline. If
CONFIG_OPTIMIZE_INLINING is set that will make the two functions
tracable which they shouldn't.

Rework so that functions __arch_counter_get_* are marked with
__always_inline so they will be inlined even if CONFIG_OPTIMIZE_INLINING
is turned on.

Fixes: 0ea41539 ("clocksource/arm_arch_timer: Use arch_timer_read_counter to access stable counters")
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 262afe92
...@@ -193,7 +193,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) ...@@ -193,7 +193,7 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl)
: "=r" (tmp) : "r" (_val)); \ : "=r" (tmp) : "r" (_val)); \
} while (0) } while (0)
static inline u64 __arch_counter_get_cntpct_stable(void) static __always_inline u64 __arch_counter_get_cntpct_stable(void)
{ {
u64 cnt; u64 cnt;
...@@ -203,7 +203,7 @@ static inline u64 __arch_counter_get_cntpct_stable(void) ...@@ -203,7 +203,7 @@ static inline u64 __arch_counter_get_cntpct_stable(void)
return cnt; return cnt;
} }
static inline u64 __arch_counter_get_cntpct(void) static __always_inline u64 __arch_counter_get_cntpct(void)
{ {
u64 cnt; u64 cnt;
...@@ -213,7 +213,7 @@ static inline u64 __arch_counter_get_cntpct(void) ...@@ -213,7 +213,7 @@ static inline u64 __arch_counter_get_cntpct(void)
return cnt; return cnt;
} }
static inline u64 __arch_counter_get_cntvct_stable(void) static __always_inline u64 __arch_counter_get_cntvct_stable(void)
{ {
u64 cnt; u64 cnt;
...@@ -223,7 +223,7 @@ static inline u64 __arch_counter_get_cntvct_stable(void) ...@@ -223,7 +223,7 @@ static inline u64 __arch_counter_get_cntvct_stable(void)
return cnt; return cnt;
} }
static inline u64 __arch_counter_get_cntvct(void) static __always_inline u64 __arch_counter_get_cntvct(void)
{ {
u64 cnt; u64 cnt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment