Commit 061f7a68 authored by Zeng Heng's avatar Zeng Heng
Browse files

arm64/mpam: Fix redefined reference of 'mpam_detect_is_enabled' 

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: default avatarZeng Heng <zengheng4@huawei.com>
parent a5aaf6b4

arch/arm64/include/asm/cpufeature.h

+0 −7
Original line number Diff line number Diff line
@@ -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);