aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/mce.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@alien8.de>2012-10-15 19:59:18 +0200
committerBorislav Petkov <bp@alien8.de>2012-10-26 14:37:57 +0200
commit84c2559dee2d69606f1fd4ce6563e79e7611a7b7 (patch)
tree086357642419bb7d887071e5ce0ec832411abc7d /arch/x86/include/asm/mce.h
parentd203f0b82481abc048e134ee4d0ea3efbee77bb1 (diff)
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>
Diffstat (limited to 'arch/x86/include/asm/mce.h')
-rw-r--r--arch/x86/include/asm/mce.h3
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);