diff options
| author | Borislav Petkov <bp@alien8.de> | 2012-10-15 20:25:17 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@alien8.de> | 2012-10-26 14:37:57 +0200 |
| commit | 7af19e4afdafa4adb5fffc569d5bb1c5e568ba98 (patch) | |
| tree | dd8734d0170efa1e805c19cdd4b7fdb3096635f4 /arch/x86/include/asm/mce.h | |
| parent | 84c2559dee2d69606f1fd4ce6563e79e7611a7b7 (diff) | |
x86, MCA: Convert the next three variables batch
Move them into the mca_config struct and adjust code touching them
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.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 73ba1853951a..a711e3f4fbc7 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -122,13 +122,17 @@ struct mce_log { struct mca_config { bool dont_log_ce; + bool cmci_disabled; + bool ignore_ce; u8 banks; s8 bootlog; int tolerant; int monarch_timeout; + int panic_timeout; u32 rip_msr; }; +extern struct mca_config mca_cfg; extern void mce_register_decode_chain(struct notifier_block *nb); extern void mce_unregister_decode_chain(struct notifier_block *nb); @@ -169,8 +173,6 @@ DECLARE_PER_CPU(struct device *, mce_device); #define MAX_NR_BANKS 32 #ifdef CONFIG_X86_MCE_INTEL -extern int mce_cmci_disabled; -extern int mce_ignore_ce; extern int mce_bios_cmci_threshold; void mce_intel_feature_init(struct cpuinfo_x86 *c); void cmci_clear(void); |