x86, MCA: Convert rip_msr, mce_bootlog, monarch_timeout

Move above configuration variables into struct mca_config and adjust
usage places accordingly.

Signed-off-by: Borislav Petkov <bp@alien8.de>
Acked-by: Tony Luck <tony.luck@intel.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index e4060de8847..73ba1853951 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -123,7 +123,10 @@ struct mce_log {
 struct mca_config {
         bool dont_log_ce;
         u8 banks;
+        s8 bootlog;
         int tolerant;
+        int monarch_timeout;
+        u32 rip_msr;
 };
 
 extern void mce_register_decode_chain(struct notifier_block *nb);