diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-12 17:54:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-12 17:54:05 +0200 |
| commit | 0237d7f355eef4d9ab8557e1597e8c9debd6c8c2 (patch) | |
| tree | 753837a9fb9e3f65bc7450994159683a47f086a6 /arch/x86/include | |
| parent | bf6c216282a260d3ce727c23fc15f28a76beff0b (diff) | |
| parent | cf870c70a194443f8fc654ddc9d6cfd02c58003b (diff) | |
| download | blackbird-op-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.tar.gz blackbird-op-linux-0237d7f355eef4d9ab8557e1597e8c9debd6c8c2.zip | |
Merge branch 'x86/mce' into x86/ras
Pursue a single RAS/MCE topic branch on x86.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/mce.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 2dfac58f3b11..b1977bad5435 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -86,6 +86,7 @@ extern int acpi_pci_disabled; extern int acpi_skip_timer_override; extern int acpi_use_timer_override; extern int acpi_fix_pin2_polarity; +extern int acpi_disable_cmcff; extern u8 acpi_sci_flags; extern int acpi_sci_override_gsi; @@ -168,6 +169,7 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) #define acpi_lapic 0 #define acpi_ioapic 0 +#define acpi_disable_cmcff 0 static inline void acpi_noirq_set(void) { } static inline void acpi_disable_pci(void) { } static inline void disable_acpi(void) { } diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 29e3093bbd21..163d7a4451f0 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -188,6 +188,9 @@ extern void register_mce_write_callback(ssize_t (*)(struct file *filp, const char __user *ubuf, size_t usize, loff_t *off)); +/* Disable CMCI/polling for MCA bank claimed by firmware */ +extern void mce_disable_bank(int bank); + /* * Exception handler */ |
