Merge Pull Request from: @hanliyang 
 
issue:
https://gitee.com/open_euler/dashboard?issue_id=IBQV7I

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"). 
 
Link:https://gitee.com/openeuler/kernel/pulls/15326

 

Reviewed-by: Jason Zeng <jason.zeng@intel.com>
Signed-off-by: Zhang Peng <zhangpeng362@huawei.com>