diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 15:19:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 15:19:11 -0400 |
| commit | 7b764cedcb1a04e795795dd0fa38570467583be3 (patch) | |
| tree | e50d5e6d1dd212e852f148e8f058d157e9c52dd7 /arch/x86/kernel/cpu/mcheck/mce-internal.h | |
| parent | 26c923ab196601011b6dd51088f47ed840e7b666 (diff) | |
| parent | 262e681183ddcdb24d64a2f993e41a226adcec29 (diff) | |
Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RAS fixes from Ingo Molnar:
"A boot parameter fix, plus a header export fix"
* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Hide mca_cfg
RAS/CEC: Use the right length for "cec_disable"
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce-internal.h')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-internal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h index 098530a93bb7..debb974fd17d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-internal.h +++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h @@ -1,3 +1,6 @@ +#ifndef __X86_MCE_INTERNAL_H__ +#define __X86_MCE_INTERNAL_H__ + #include <linux/device.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_unregister_injector_chain(struct notifier_block *nb) { } #endif + +extern struct mca_config mca_cfg; + +#endif /* __X86_MCE_INTERNAL_H__ */ |