diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 22:19:11 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-14 22:19:11 +0300 |
| commit | 7b764cedcb1a04e795795dd0fa38570467583be3 (patch) | |
| tree | e50d5e6d1dd212e852f148e8f058d157e9c52dd7 /arch/x86/include/asm | |
| parent | 26c923ab196601011b6dd51088f47ed840e7b666 (diff) | |
| parent | 262e681183ddcdb24d64a2f993e41a226adcec29 (diff) | |
| download | linux-7b764cedcb1a04e795795dd0fa38570467583be3.tar.xz | |
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/include/asm')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 181264989db5..8edac1de2e35 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -187,7 +187,6 @@ struct mca_msr_regs { extern struct mce_vendor_flags mce_flags; -extern struct mca_config mca_cfg; extern struct mca_msr_regs msr_ops; enum mce_notifier_prios { |