From: Sudeep KarkadaNagesha <[email protected]> We must not declare arch_counter_set_user_access as __cpuinit as we need to use it in warm reset paths like CPU PM notifiers.
Signed-off-by: Sudeep KarkadaNagesha <[email protected]> Reviewed-by: Lorenzo Pieralisi <[email protected]> Reviewed-by: Will Deacon <[email protected]> --- arch/arm/include/asm/arch_timer.h | 2 +- arch/arm64/include/asm/arch_timer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 6725017..26c65ae 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -89,7 +89,7 @@ static inline u64 arch_counter_get_cntvct(void) return cval; } -static inline void __cpuinit arch_counter_set_user_access(int divider) +static inline void arch_counter_set_user_access(int divider) { u32 cntkctl; diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index 2269944..3494102 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -97,7 +97,7 @@ static inline u32 arch_timer_get_cntfrq(void) return val; } -static inline void __cpuinit arch_counter_set_user_access(int divider) +static inline void arch_counter_set_user_access(int divider) { u32 cntkctl; -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
