Now that each feature flag is on its own line, i.e. brevity isn't a major
concern, drop the "SF" acronym and use the (almost) full name, SCATTERED_F.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
arch/x86/kvm/cpuid.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 3b8ec5e7e39a..a1a80f1f10ec 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -700,7 +700,7 @@ do { \
})
/* Scattered Flag - For features that are scattered by cpufeatures.h. */
-#define SF(name) \
+#define SCATTERED_F(name) \
({ \
BUILD_BUG_ON(X86_FEATURE_##name >= MAX_CPU_FEATURES); \
KVM_VALIDATE_CPU_CAP_USAGE(name); \
@@ -966,9 +966,9 @@ void kvm_set_cpu_caps(void)
);
kvm_cpu_cap_init(CPUID_12_EAX,
- SF(SGX1) |
- SF(SGX2) |
- SF(SGX_EDECCSSA)
+ SCATTERED_F(SGX1) |
+ SCATTERED_F(SGX2) |
+ SCATTERED_F(SGX_EDECCSSA)
);
kvm_cpu_cap_init(CPUID_24_0_EBX,
@@ -1035,7 +1035,7 @@ void kvm_set_cpu_caps(void)
kvm_cpu_cap_set(X86_FEATURE_GBPAGES);
kvm_cpu_cap_init(CPUID_8000_0007_EDX,
- SF(CONSTANT_TSC)
+ SCATTERED_F(CONSTANT_TSC)
);
kvm_cpu_cap_init(CPUID_8000_0008_EBX,
@@ -1156,7 +1156,7 @@ void kvm_set_cpu_caps(void)
EXPORT_SYMBOL_GPL(kvm_set_cpu_caps);
#undef F
-#undef SF
+#undef SCATTERED_F
#undef X86_64_F
#undef EMULATED_F
#undef SYNTHESIZED_F
--
2.47.0.338.g60cca15819-goog
