hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IATSCU

--------------------------------

Fix re-defined reference of 'mpam_detect_is_enabled' when CONFIG_ARM64_MPAM is enabled.

Fixes: 797c68d3b52d ("arm64/mpam: Check mpam_detect_is_enabled() before accessing MPAM registers") Signed-off-by: Zeng Heng zengheng4@huawei.com --- arch/arm64/include/asm/cpufeature.h | 7 ------- 1 file changed, 7 deletions(-)

diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index f8ec4b20fa69..4c759e0dcc21 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -858,14 +858,7 @@ static inline bool cpus_support_mpam(void) cpus_have_final_cap(ARM64_MPAM); }

-#ifdef CONFIG_ARM64_MPAM bool mpam_detect_is_enabled(void); -#else -static inline bool mpam_detect_is_enabled(void) -{ - return false; -} -#endif

int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt); bool try_emulate_mrs(struct pt_regs *regs, u32 isn);