Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 262e6811 authored Oct 02, 2017 by Borislav Petkov Committed by Thomas Gleixner Oct 05, 2017

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 <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20171002092836.22971-3-bp@alien8.de

parent 69a33000

arch/x86/include/asm/mce.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -187,7 +187,6 @@ struct mca_msr_regs {

	extern struct mce_vendor_flags mce_flags;		extern struct mce_vendor_flags mce_flags;

	extern struct mca_config mca_cfg;
	extern struct mca_msr_regs msr_ops;		extern struct mca_msr_regs msr_ops;

	enum mce_notifier_prios {		enum mce_notifier_prios {

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

+7 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef __X86_MCE_INTERNAL_H__
			#define __X86_MCE_INTERNAL_H__

	#include <linux/device.h>		#include <linux/device.h>
	#include <asm/mce.h>		#include <asm/mce.h>

	@@ -108,3 +111,7 @@ static inline void mce_work_trigger(void) { }
	static inline void mce_register_injector_chain(struct notifier_block *nb) { }		static inline void mce_register_injector_chain(struct notifier_block *nb) { }
	static inline void mce_unregister_injector_chain(struct notifier_block *nb) { }		static inline void mce_unregister_injector_chain(struct notifier_block *nb) { }
	#endif		#endif

			extern struct mca_config mca_cfg;

			#endif /* __X86_MCE_INTERNAL_H__ */

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,8 @@
	#include <asm/msr.h>		#include <asm/msr.h>
	#include <asm/trace/irq_vectors.h>		#include <asm/trace/irq_vectors.h>

			#include "mce-internal.h"

	#define NR_BLOCKS 5		#define NR_BLOCKS 5
	#define THRESHOLD_MAX 0xFFF		#define THRESHOLD_MAX 0xFFF
	#define INT_TYPE_APIC 0x00020000		#define INT_TYPE_APIC 0x00020000