diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-26 10:53:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-26 10:53:45 +0200 |
| commit | ca02c216742c9e6aa6c4dce31a0be417bc6685b3 (patch) | |
| tree | 7383e04dc0cf109f6b53ef0c9d0f0719128bbbbf /arch/x86/include | |
| parent | d908e1ebbc66a4a44469f27dcfb1f2f46144c4bf (diff) | |
| parent | 0644414e62561f0ba1bea7c5ba6a94cc50dac3e3 (diff) | |
| download | op-kernel-dev-ca02c216742c9e6aa6c4dce31a0be417bc6685b3.zip op-kernel-dev-ca02c216742c9e6aa6c4dce31a0be417bc6685b3.tar.gz | |
Merge tag 'please-pull-mce-bitmap-comment' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/ras
Pull MCE updates from Tony Luck:
"Better comments so we understand our existing machine check
bank bitmaps - prelude to adding another bitmap soon."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/irq.h | 5 | ||||
| -rw-r--r-- | arch/x86/include/asm/microcode.h | 4 | ||||
| -rw-r--r-- | arch/x86/include/asm/nmi.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index ba870bb..57873be 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h @@ -41,4 +41,9 @@ extern int vector_used_by_percpu_irq(unsigned int vector); extern void init_ISA_irqs(void); +#ifdef CONFIG_X86_LOCAL_APIC +void arch_trigger_all_cpu_backtrace(void); +#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace +#endif + #endif /* _ASM_X86_IRQ_H */ diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 6825e2e..6bc3985 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -60,11 +60,11 @@ static inline void __exit exit_amd_microcode(void) {} #ifdef CONFIG_MICROCODE_EARLY #define MAX_UCODE_COUNT 128 extern void __init load_ucode_bsp(void); -extern __init void load_ucode_ap(void); +extern void __cpuinit load_ucode_ap(void); extern int __init save_microcode_in_initrd(void); #else static inline void __init load_ucode_bsp(void) {} -static inline __init void load_ucode_ap(void) {} +static inline void __cpuinit load_ucode_ap(void) {} static inline int __init save_microcode_in_initrd(void) { return 0; diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h index c0fa356..86f9301 100644 --- a/arch/x86/include/asm/nmi.h +++ b/arch/x86/include/asm/nmi.h @@ -18,9 +18,7 @@ extern int proc_nmi_enabled(struct ctl_table *, int , void __user *, size_t *, loff_t *); extern int unknown_nmi_panic; -void arch_trigger_all_cpu_backtrace(void); -#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace -#endif +#endif /* CONFIG_X86_LOCAL_APIC */ #define NMI_FLAG_FIRST 1 |
