x86/mce: Sort mca_config members to get rid of unnecessary padding

$ pahole -C mca_config arch/x86/kernel/cpu/mce/core.o

before:

   /* size: 40, cachelines: 1, members: 16 */
   /* sum members: 21, holes: 1, sum holes: 3 */
   /* sum bitfield members: 64 bits, bit holes: 2, sum bit holes: 32 bits */
   /* padding: 4 */
   /* last cacheline: 40 bytes */

after:

   /* size: 32, cachelines: 1, members: 16 */
   /* padding: 3 */
   /* last cacheline: 32 bytes */

No functional changes.

Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20210922165101.18951-6-bp@alien8.de

diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h
index 21865545cd3b6d97b06d5ea6a0314159b9666eb9..37b9e381ef0272ace9ef529046b777420ba5034c 100644 (file)
--- a/arch/x86/kernel/cpu/mce/internal.h
+++ b/arch/x86/kernel/cpu/mce/internal.h
@@ -113,11 +113,6 @@ static inline void mce_unregister_injector_chain(struct notifier_block *nb)        { }
 #endif
 
 struct mca_config {
-       bool dont_log_ce;
-       bool cmci_disabled;
-       bool ignore_ce;
-       bool print_all;
-
        __u64 lmce_disabled             : 1,
              disabled                  : 1,
              ser                       : 1,
@@ -127,11 +122,16 @@ struct mca_config {
              initialized               : 1,
              __reserved                : 58;
 
-       s8 bootlog;
+       bool dont_log_ce;
+       bool cmci_disabled;
+       bool ignore_ce;
+       bool print_all;
+
        int tolerant;
        int monarch_timeout;
        int panic_timeout;
        u32 rip_msr;
+       s8 bootlog;
 };
 
 extern struct mca_config mca_cfg;