Unverified Commit 940464a3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11857 arm64/mpam: Fix redefined reference of 'mpam_detect_is_enabled' 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KVMHMD34BXBLNQ46L6UHDMZLMCBNLWVP/ 
 
https://gitee.com/openeuler/kernel/issues/IATSCU 
 
Link:https://gitee.com/openeuler/kernel/pulls/11857

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fec0ddb7 061f7a68

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);