hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I90N2C CVE: NA ---------------------------------------------------------------------- If ARM64_HAS_NMI is enabled, it doesn't mean NMI is enabled. When NMI is enabled, ARM64_USES_NMI is set to true, so use it instead. Fixes: 1c203efa0a42 ("arm64/asm: Introduce assembly macros for managing ALLINT") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/arm64/include/asm/assembler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 38b23786aeb4..d54615963885 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -36,7 +36,7 @@ .macro disable_allint #ifdef CONFIG_ARM64_NMI -alternative_if ARM64_HAS_NMI +alternative_if ARM64_USES_NMI msr_s SYS_ALLINT_SET, xzr alternative_else_nop_endif #endif @@ -44,7 +44,7 @@ alternative_else_nop_endif .macro enable_allint #ifdef CONFIG_ARM64_NMI -alternative_if ARM64_HAS_NMI +alternative_if ARM64_USES_NMI msr_s SYS_ALLINT_CLR, xzr alternative_else_nop_endif #endif -- 2.25.1