Skip to content

Commit 262e681

Browse files
suryasaimadhuKAGA-KOKO
authored andcommitted
x86/mce: Hide mca_cfg
Now that lguest is gone, put it in the internal header which should be used only by MCA/RAS code. Add missing header guards while at it. No functional change. Signed-off-by: Borislav Petkov <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 69a3300 commit 262e681

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

arch/x86/include/asm/mce.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ struct mca_msr_regs {
187187

188188
extern struct mce_vendor_flags mce_flags;
189189

190-
extern struct mca_config mca_cfg;
191190
extern struct mca_msr_regs msr_ops;
192191

193192
enum mce_notifier_prios {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#ifndef __X86_MCE_INTERNAL_H__
2+
#define __X86_MCE_INTERNAL_H__
3+
14
#include <linux/device.h>
25
#include <asm/mce.h>
36

@@ -108,3 +111,7 @@ static inline void mce_work_trigger(void) { }
108111
static inline void mce_register_injector_chain(struct notifier_block *nb) { }
109112
static inline void mce_unregister_injector_chain(struct notifier_block *nb) { }
110113
#endif
114+
115+
extern struct mca_config mca_cfg;
116+
117+
#endif /* __X86_MCE_INTERNAL_H__ */

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include <asm/msr.h>
2929
#include <asm/trace/irq_vectors.h>
3030

31+
#include "mce-internal.h"
32+
3133
#define NR_BLOCKS 5
3234
#define THRESHOLD_MAX 0xFFF
3335
#define INT_TYPE_APIC 0x00020000

0 commit comments

Comments
 (0)