x86/RAS: Rename smca_bank_names to smca_names (a9a1c0ee) · Commits · 戴 / test

arch/x86/include/asm/mce.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,7 @@ struct smca_bank_name {
		const char long_name; / Long name for pretty-printing */
		};

		extern struct smca_bank_name smca_bank_names[N_SMCA_BANK_TYPES];
		extern struct smca_bank_name smca_names[N_SMCA_BANK_TYPES];

		#define HWID_MCATYPE(hwid, mcatype) ((hwid << 16) \| mcatype)

+3 −3

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ static const char * const smca_umc_block_names[] = {
		"misc_umc"
		};

		struct smca_bank_name smca_bank_names[] = {
		struct smca_bank_name smca_names[] = {
		[SMCA_LS] = { "load_store", "Load Store Unit" },
		[SMCA_IF] = { "insn_fetch", "Instruction Fetch Unit" },
		[SMCA_L2_CACHE] = { "l2_cache", "L2 Cache" },
		@@ -84,7 +84,7 @@ struct smca_bank_name smca_bank_names[] = {
		[SMCA_PSP] = { "psp", "Platform Security Processor" },
		[SMCA_SMU] = { "smu", "System Management Unit" },
		};
		EXPORT_SYMBOL_GPL(smca_bank_names);
		EXPORT_SYMBOL_GPL(smca_names);

		static struct smca_hwid smca_hwid_mcatypes[] = {
		/* { bank_type, hwid_mcatype, xec_bitmap } */
		@@ -832,7 +832,7 @@ static const char get_name(unsigned int bank, struct threshold_block b)
		}

		snprintf(buf_mcatype, MAX_MCATYPE_NAME_LEN,
		"%s_%x", smca_bank_names[bank_type].name,
		"%s_%x", smca_names[bank_type].name,
		smca_banks[bank].id);
		return buf_mcatype;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ static void decode_smca_errors(struct mce *m)
		return;

		bank_type = hwid->bank_type;
		ip_name = smca_bank_names[bank_type].long_name;
		ip_name = smca_names[bank_type].long_name;

		pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec);