Skip to content

Commit 1580246

Browse files
committed
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 <[email protected]> Reviewed-by: Tony Luck <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent cc46666 commit 1580246

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/x86/kernel/cpu/mce/internal.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@ static inline void mce_unregister_injector_chain(struct notifier_block *nb) { }
113113
#endif
114114

115115
struct mca_config {
116-
bool dont_log_ce;
117-
bool cmci_disabled;
118-
bool ignore_ce;
119-
bool print_all;
120-
121116
__u64 lmce_disabled : 1,
122117
disabled : 1,
123118
ser : 1,
@@ -127,11 +122,16 @@ struct mca_config {
127122
initialized : 1,
128123
__reserved : 58;
129124

130-
s8 bootlog;
125+
bool dont_log_ce;
126+
bool cmci_disabled;
127+
bool ignore_ce;
128+
bool print_all;
129+
131130
int tolerant;
132131
int monarch_timeout;
133132
int panic_timeout;
134133
u32 rip_msr;
134+
s8 bootlog;
135135
};
136136

137137
extern struct mca_config mca_cfg;

0 commit comments

Comments
 (0)