Commit 892e509f authored by hanliyang's avatar hanliyang
Browse files

x86/cpufeatures: Rename X86_FEATURE_SM{3,4} to X86_FEATURE_HYGON_SM{3,4} 

hygon inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBQV7I


CVE: NA

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

The upstream commit a0423af92cb3 ("x86: KVM: Advertise CPUIDs for new
instructions in Clearwater Forest") has introduced the macros
X86_FEATURE_SM3 and X86_FEATURE_SM4, which conflict with the
non-upstreamed commit 4b0253be ("x86/cpufeatures: Add
CPUID_8C86_0000_EDX CPUID leaf"). To address this issue, we rename
X86_FEATURE_SM{3,4} to X86_FEATURE_HYGON_SM{3,4}.

Fixes: 4b0253be ("x86/cpufeatures: Add CPUID_8C86_0000_EDX CPUID leaf")
Signed-off-by: default avatarhanliyang <hanliyang@hygon.cn>
parent 9d22d5b7

arch/x86/include/asm/cpufeatures.h

+2 −2
Original line number Diff line number Diff line
@@ -492,8 +492,8 @@ 
#define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* "" Clear branch history at vmexit using SW loop */



/* HYGON-defined CPU features, CPUID level 0x8c860000:0 (EDX), word 29 */

#define X86_FEATURE_SM3			(29*32 + 1) /* SM3 instructions */

#define X86_FEATURE_SM4			(29*32 + 2) /* SM4 instructions */

#define X86_FEATURE_HYGON_SM3		(29*32 + 1) /* "sm3" SM3 instructions */

#define X86_FEATURE_HYGON_SM4		(29*32 + 2) /* "sm4" SM4 instructions */



/* VIA/Cyrix/Centaur/Zhaoxin-defined CPU features, CPUID level 0xC0000006, word 21 */

#define X86_FEATURE_ZXPAUSE		(30*32 + 0) /* Zhaoxin ZXPAUSE */