diff options
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 11 | 
1 files changed, 3 insertions, 8 deletions
| diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 6c77c03139f7..31e3cb550fb3 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -241,12 +241,14 @@ struct cper_ia_proc_ctx;  #ifdef CONFIG_X86_MCE  int mcheck_init(void); +void mca_bsp_init(struct cpuinfo_x86 *c);  void mcheck_cpu_init(struct cpuinfo_x86 *c);  void mcheck_cpu_clear(struct cpuinfo_x86 *c);  int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info,  			       u64 lapic_id);  #else  static inline int mcheck_init(void) { return 0; } +static inline void mca_bsp_init(struct cpuinfo_x86 *c) {}  static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {}  static inline void mcheck_cpu_clear(struct cpuinfo_x86 *c) {}  static inline int apei_smca_report_x86_error(struct cper_ia_proc_ctx *ctx_info, @@ -290,8 +292,7 @@ DECLARE_PER_CPU(mce_banks_t, mce_poll_banks);  enum mcp_flags {  	MCP_TIMESTAMP	= BIT(0),	/* log time stamp */  	MCP_UC		= BIT(1),	/* log uncorrected errors */ -	MCP_DONTLOG	= BIT(2),	/* only clear, don't log */ -	MCP_QUEUE_LOG	= BIT(3),	/* only queue to genpool */ +	MCP_QUEUE_LOG	= BIT(2),	/* only queue to genpool */  };  void machine_check_poll(enum mcp_flags flags, mce_banks_t *b); @@ -371,15 +372,9 @@ enum smca_bank_types {  extern bool amd_mce_is_memory_error(struct mce *m); -extern int mce_threshold_create_device(unsigned int cpu); -extern int mce_threshold_remove_device(unsigned int cpu); -  void mce_amd_feature_init(struct cpuinfo_x86 *c);  enum smca_bank_types smca_get_bank_type(unsigned int cpu, unsigned int bank);  #else - -static inline int mce_threshold_create_device(unsigned int cpu)		{ return 0; }; -static inline int mce_threshold_remove_device(unsigned int cpu)		{ return 0; };  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 | 
