Unverified Commit 7f1817c1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7572 Fix pseudo nmi identifier undeclaration complilation error 

Merge Pull Request from: @cj-xiaocai 
 
Fix the complilation error that enable_pseudo_nmi is undeclared while disable CONFIG_ARM64_PSEUDO_NMI and CONFIG_ARM64_NMI.

https://gitee.com/openeuler/kernel/issues/I9QOYJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/7572

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 68f14388 c6ce2bec

arch/arm64/kernel/cpufeature.c

+2 −0
Original line number Diff line number Diff line
@@ -2196,10 +2196,12 @@ static bool use_nmi(const struct arm64_cpu_capabilities *entry, int scope) 
	 */

	if (!IS_ENABLED(CONFIG_ARM64_NMI))

		pr_info("CONFIG_ARM64_NMI disabled, using NMIs for guests only\n");

#ifdef CONFIG_ARM64_PSEUDO_NMI

	else if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && enable_pseudo_nmi) {

		pr_info("Pseudo NMI enabled, not using architected NMI\n");

		return false;

	}

#endif



	return true;

}