aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-11-02 08:24:47 -0400
committerThomas Gleixner <tglx@linutronix.de>2016-11-08 11:10:14 -0500
commita9a1c0ee04aa771e5523ae33e458c702261ab547 (patch)
tree8ec82a2c98dfaf66433dcc0fa0cc36d2c0eb06ea
parent1ce9cd7f9f0b71af7c496b816734bc2dc699363a (diff)
x86/RAS: Rename smca_bank_names to smca_names
Make it differ more from struct smca_bank_name for better readability. Signed-off-by: Borislav Petkov <bp@suse.de> Tested-by: Yazen Ghannam <yazen.ghannam@amd.com> Link: http://lkml.kernel.org/r/20161103125556.15482-3-bp@alien8.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/include/asm/mce.h2
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_amd.c6
-rw-r--r--drivers/edac/mce_amd.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index ccc801a0da0f..8ffd21596dd7 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -361,7 +361,7 @@ struct smca_bank_name {
361 const char *long_name; /* Long name for pretty-printing */ 361 const char *long_name; /* Long name for pretty-printing */
362}; 362};
363 363
364extern struct smca_bank_name smca_bank_names[N_SMCA_BANK_TYPES]; 364extern struct smca_bank_name smca_names[N_SMCA_BANK_TYPES];
365 365
366#define HWID_MCATYPE(hwid, mcatype) ((hwid << 16) | mcatype) 366#define HWID_MCATYPE(hwid, mcatype) ((hwid << 16) | mcatype)
367 367
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index ff81667af2f2..afeb02b87127 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -69,7 +69,7 @@ static const char * const smca_umc_block_names[] = {
69 "misc_umc" 69 "misc_umc"
70}; 70};
71 71
72struct smca_bank_name smca_bank_names[] = { 72struct smca_bank_name smca_names[] = {
73 [SMCA_LS] = { "load_store", "Load Store Unit" }, 73 [SMCA_LS] = { "load_store", "Load Store Unit" },
74 [SMCA_IF] = { "insn_fetch", "Instruction Fetch Unit" }, 74 [SMCA_IF] = { "insn_fetch", "Instruction Fetch Unit" },
75 [SMCA_L2_CACHE] = { "l2_cache", "L2 Cache" }, 75 [SMCA_L2_CACHE] = { "l2_cache", "L2 Cache" },
@@ -84,7 +84,7 @@ struct smca_bank_name smca_bank_names[] = {
84 [SMCA_PSP] = { "psp", "Platform Security Processor" }, 84 [SMCA_PSP] = { "psp", "Platform Security Processor" },
85 [SMCA_SMU] = { "smu", "System Management Unit" }, 85 [SMCA_SMU] = { "smu", "System Management Unit" },
86}; 86};
87EXPORT_SYMBOL_GPL(smca_bank_names); 87EXPORT_SYMBOL_GPL(smca_names);
88 88
89static struct smca_hwid smca_hwid_mcatypes[] = { 89static struct smca_hwid smca_hwid_mcatypes[] = {
90 /* { bank_type, hwid_mcatype, xec_bitmap } */ 90 /* { bank_type, hwid_mcatype, xec_bitmap } */
@@ -832,7 +832,7 @@ static const char *get_name(unsigned int bank, struct threshold_block *b)
832 } 832 }
833 833
834 snprintf(buf_mcatype, MAX_MCATYPE_NAME_LEN, 834 snprintf(buf_mcatype, MAX_MCATYPE_NAME_LEN,
835 "%s_%x", smca_bank_names[bank_type].name, 835 "%s_%x", smca_names[bank_type].name,
836 smca_banks[bank].id); 836 smca_banks[bank].id);
837 return buf_mcatype; 837 return buf_mcatype;
838} 838}
diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 8e96c6ddf272..3dee58583d25 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -867,7 +867,7 @@ static void decode_smca_errors(struct mce *m)
867 return; 867 return;
868 868
869 bank_type = hwid->bank_type; 869 bank_type = hwid->bank_type;
870 ip_name = smca_bank_names[bank_type].long_name; 870 ip_name = smca_names[bank_type].long_name;
871 871
872 pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec); 872 pr_emerg(HW_ERR "%s Extended Error Code: %d\n", ip_name, xec);
873 873