Commit 053d1805 authored by Qiuxu Zhuo's avatar Qiuxu Zhuo Committed by Borislav Petkov (AMD)
Browse files

x86/mce: Remove the redundant mce_hygon_feature_init() 



Get HYGON to directly call mce_amd_feature_init() and remove the redundant
mce_hygon_feature_init().

Suggested-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: default avatarQiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarSohil Mehta <sohil.mehta@intel.com>
Reviewed-by: default avatarYazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/r/20241212140103.66964-7-qiuxu.zhuo@intel.com
parent 359d7a98

arch/x86/include/asm/mce.h

+0 −2
Original line number Diff line number Diff line
@@ -386,8 +386,6 @@ static inline bool amd_mce_is_memory_error(struct mce *m) { return false; }; 
static inline void mce_amd_feature_init(struct cpuinfo_x86 *c)		{ }

#endif



static inline void mce_hygon_feature_init(struct cpuinfo_x86 *c)	{ return mce_amd_feature_init(c); }



unsigned long copy_mc_fragile_handle_tail(char *to, char *from, unsigned len);



#endif /* _ASM_X86_MCE_H */

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

+2 −6
Original line number Diff line number Diff line
@@ -2118,13 +2118,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) 
		mce_intel_feature_init(c);

		break;



	case X86_VENDOR_AMD: {

		mce_amd_feature_init(c);

		break;

		}



	case X86_VENDOR_AMD:

	case X86_VENDOR_HYGON:

		mce_hygon_feature_init(c);

		mce_amd_feature_init(c);

		break;



	case X86_VENDOR_CENTAUR: