Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09933946 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/mce: Convert 'struct mca_config' bools to a bitfield 



... to save space when future flags are added.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20180221101900.10326-3-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a189c032

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

+8 −5
Original line number Diff line number Diff line
@@ -131,12 +131,15 @@ static inline void mce_unmap_kpfn(unsigned long pfn) {} 
struct mca_config {

	bool dont_log_ce;

	bool cmci_disabled;

	bool lmce_disabled;

	bool ignore_ce;

	bool disabled;

	bool ser;

	bool recovery;

	bool bios_cmci_threshold;



	__u64 lmce_disabled		: 1,

	      disabled			: 1,

	      ser			: 1,

	      recovery			: 1,

	      bios_cmci_threshold	: 1,

	      __reserved		: 59;



	u8 banks;

	s8 bootlog;

	int tolerant;

arch/x86/kernel/cpu/mcheck/mce.c

+8 −8
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static int __mcheck_cpu_cap_init(void) 
		mca_cfg.rip_msr = MSR_IA32_MCG_EIP;



	if (cap & MCG_SER_P)

		mca_cfg.ser = true;

		mca_cfg.ser = 1;



	return 0;

}
@@ -1819,12 +1819,12 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) 
		return;



	if (__mcheck_cpu_cap_init() < 0 || __mcheck_cpu_apply_quirks(c) < 0) {

		mca_cfg.disabled = true;

		mca_cfg.disabled = 1;

		return;

	}



	if (mce_gen_pool_init()) {

		mca_cfg.disabled = true;

		mca_cfg.disabled = 1;

		pr_emerg("Couldn't allocate MCE records pool!\n");

		return;

	}
@@ -1902,11 +1902,11 @@ static int __init mcheck_enable(char *str) 
	if (*str == '=')

		str++;

	if (!strcmp(str, "off"))

		cfg->disabled = true;

		cfg->disabled = 1;

	else if (!strcmp(str, "no_cmci"))

		cfg->cmci_disabled = true;

	else if (!strcmp(str, "no_lmce"))

		cfg->lmce_disabled = true;

		cfg->lmce_disabled = 1;

	else if (!strcmp(str, "dont_log_ce"))

		cfg->dont_log_ce = true;

	else if (!strcmp(str, "ignore_ce"))
@@ -1914,9 +1914,9 @@ static int __init mcheck_enable(char *str) 
	else if (!strcmp(str, "bootlog") || !strcmp(str, "nobootlog"))

		cfg->bootlog = (str[0] == 'b');

	else if (!strcmp(str, "bios_cmci_threshold"))

		cfg->bios_cmci_threshold = true;

		cfg->bios_cmci_threshold = 1;

	else if (!strcmp(str, "recovery"))

		cfg->recovery = true;

		cfg->recovery = 1;

	else if (isdigit(str[0])) {

		if (get_option(&str, &cfg->tolerant) == 2)

			get_option(&str, &(cfg->monarch_timeout));
@@ -2381,7 +2381,7 @@ device_initcall_sync(mcheck_init_device); 
 */

static int __init mcheck_disable(char *str)

{

	mca_cfg.disabled = true;

	mca_cfg.disabled = 1;

	return 1;

}

__setup("nomce", mcheck_disable);