x86/cpu: Fix formatting of cpuid_bits[] in scattered.c

Realign initializers to accomodate for longer X86_FEATURE define names.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>

diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index 1e5433259444341bf86303449bccf8af1ba0eccf..16f3ca30626ab29eb192e8c59f82c5a5834b0fab 100644 (file)
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -24,36 +24,36 @@ struct cpuid_bit {
  * levels are different and there is a separate entry for each.
  */
 static const struct cpuid_bit cpuid_bits[] = {
-       { X86_FEATURE_APERFMPERF,       CPUID_ECX,  0, 0x00000006, 0 },
-       { X86_FEATURE_EPB,              CPUID_ECX,  3, 0x00000006, 0 },
-       { X86_FEATURE_INTEL_PPIN,       CPUID_EBX,  0, 0x00000007, 1 },
-       { X86_FEATURE_RRSBA_CTRL,       CPUID_EDX,  2, 0x00000007, 2 },
-       { X86_FEATURE_BHI_CTRL,         CPUID_EDX,  4, 0x00000007, 2 },
-       { X86_FEATURE_CQM_LLC,          CPUID_EDX,  1, 0x0000000f, 0 },
-       { X86_FEATURE_CQM_OCCUP_LLC,    CPUID_EDX,  0, 0x0000000f, 1 },
-       { X86_FEATURE_CQM_MBM_TOTAL,    CPUID_EDX,  1, 0x0000000f, 1 },
-       { X86_FEATURE_CQM_MBM_LOCAL,    CPUID_EDX,  2, 0x0000000f, 1 },
-       { X86_FEATURE_CAT_L3,           CPUID_EBX,  1, 0x00000010, 0 },
-       { X86_FEATURE_CAT_L2,           CPUID_EBX,  2, 0x00000010, 0 },
-       { X86_FEATURE_CDP_L3,           CPUID_ECX,  2, 0x00000010, 1 },
-       { X86_FEATURE_CDP_L2,           CPUID_ECX,  2, 0x00000010, 2 },
-       { X86_FEATURE_MBA,              CPUID_EBX,  3, 0x00000010, 0 },
-       { X86_FEATURE_PER_THREAD_MBA,   CPUID_ECX,  0, 0x00000010, 3 },
-       { X86_FEATURE_SGX1,             CPUID_EAX,  0, 0x00000012, 0 },
-       { X86_FEATURE_SGX2,             CPUID_EAX,  1, 0x00000012, 0 },
-       { X86_FEATURE_SGX_EDECCSSA,     CPUID_EAX, 11, 0x00000012, 0 },
-       { X86_FEATURE_HW_PSTATE,        CPUID_EDX,  7, 0x80000007, 0 },
-       { X86_FEATURE_CPB,              CPUID_EDX,  9, 0x80000007, 0 },
-       { X86_FEATURE_PROC_FEEDBACK,    CPUID_EDX, 11, 0x80000007, 0 },
-       { X86_FEATURE_AMD_FAST_CPPC,    CPUID_EDX, 15, 0x80000007, 0 },
-       { X86_FEATURE_MBA,              CPUID_EBX,  6, 0x80000008, 0 },
-       { X86_FEATURE_SMBA,             CPUID_EBX,  2, 0x80000020, 0 },
-       { X86_FEATURE_BMEC,             CPUID_EBX,  3, 0x80000020, 0 },
-       { X86_FEATURE_AMD_WORKLOAD_CLASS,       CPUID_EAX,  22, 0x80000021, 0 },
-       { X86_FEATURE_PERFMON_V2,       CPUID_EAX,  0, 0x80000022, 0 },
-       { X86_FEATURE_AMD_LBR_V2,       CPUID_EAX,  1, 0x80000022, 0 },
+       { X86_FEATURE_APERFMPERF,               CPUID_ECX,  0, 0x00000006, 0 },
+       { X86_FEATURE_EPB,                      CPUID_ECX,  3, 0x00000006, 0 },
+       { X86_FEATURE_INTEL_PPIN,               CPUID_EBX,  0, 0x00000007, 1 },
+       { X86_FEATURE_RRSBA_CTRL,               CPUID_EDX,  2, 0x00000007, 2 },
+       { X86_FEATURE_BHI_CTRL,                 CPUID_EDX,  4, 0x00000007, 2 },
+       { X86_FEATURE_CQM_LLC,                  CPUID_EDX,  1, 0x0000000f, 0 },
+       { X86_FEATURE_CQM_OCCUP_LLC,            CPUID_EDX,  0, 0x0000000f, 1 },
+       { X86_FEATURE_CQM_MBM_TOTAL,            CPUID_EDX,  1, 0x0000000f, 1 },
+       { X86_FEATURE_CQM_MBM_LOCAL,            CPUID_EDX,  2, 0x0000000f, 1 },
+       { X86_FEATURE_CAT_L3,                   CPUID_EBX,  1, 0x00000010, 0 },
+       { X86_FEATURE_CAT_L2,                   CPUID_EBX,  2, 0x00000010, 0 },
+       { X86_FEATURE_CDP_L3,                   CPUID_ECX,  2, 0x00000010, 1 },
+       { X86_FEATURE_CDP_L2,                   CPUID_ECX,  2, 0x00000010, 2 },
+       { X86_FEATURE_MBA,                      CPUID_EBX,  3, 0x00000010, 0 },
+       { X86_FEATURE_PER_THREAD_MBA,           CPUID_ECX,  0, 0x00000010, 3 },
+       { X86_FEATURE_SGX1,                     CPUID_EAX,  0, 0x00000012, 0 },
+       { X86_FEATURE_SGX2,                     CPUID_EAX,  1, 0x00000012, 0 },
+       { X86_FEATURE_SGX_EDECCSSA,             CPUID_EAX, 11, 0x00000012, 0 },
+       { X86_FEATURE_HW_PSTATE,                CPUID_EDX,  7, 0x80000007, 0 },
+       { X86_FEATURE_CPB,                      CPUID_EDX,  9, 0x80000007, 0 },
+       { X86_FEATURE_PROC_FEEDBACK,            CPUID_EDX, 11, 0x80000007, 0 },
+       { X86_FEATURE_AMD_FAST_CPPC,            CPUID_EDX, 15, 0x80000007, 0 },
+       { X86_FEATURE_MBA,                      CPUID_EBX,  6, 0x80000008, 0 },
+       { X86_FEATURE_SMBA,                     CPUID_EBX,  2, 0x80000020, 0 },
+       { X86_FEATURE_BMEC,                     CPUID_EBX,  3, 0x80000020, 0 },
+       { X86_FEATURE_AMD_WORKLOAD_CLASS,       CPUID_EAX, 22, 0x80000021, 0 },
+       { X86_FEATURE_PERFMON_V2,               CPUID_EAX,  0, 0x80000022, 0 },
+       { X86_FEATURE_AMD_LBR_V2,               CPUID_EAX,  1, 0x80000022, 0 },
        { X86_FEATURE_AMD_LBR_PMC_FREEZE,       CPUID_EAX,  2, 0x80000022, 0 },
-       { X86_FEATURE_AMD_HETEROGENEOUS_CORES,  CPUID_EAX,  30, 0x80000026, 0 },
+       { X86_FEATURE_AMD_HETEROGENEOUS_CORES,  CPUID_EAX, 30, 0x80000026, 0 },
        { 0, 0, 0, 0, 0 }
 };