tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RAS fixes from Ingo Molnar:
"A boot parameter fix, plus a header export fix"

* 'ras-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mce: Hide mca_cfg
RAS/CEC: Use the right length for "cec_disable"

Linus Torvalds 7b764ced 26c923ab

+10 -2
-1
arch/x86/include/asm/mce.h
··· 187 187 188 188 extern struct mce_vendor_flags mce_flags; 189 189 190 - extern struct mca_config mca_cfg; 191 190 extern struct mca_msr_regs msr_ops; 192 191 193 192 enum mce_notifier_prios {
+7
arch/x86/kernel/cpu/mcheck/mce-internal.h
··· 1 + #ifndef __X86_MCE_INTERNAL_H__ 2 + #define __X86_MCE_INTERNAL_H__ 3 + 1 4 #include <linux/device.h> 2 5 #include <asm/mce.h> 3 6 ··· 111 108 static inline void mce_register_injector_chain(struct notifier_block *nb) { } 112 109 static inline void mce_unregister_injector_chain(struct notifier_block *nb) { } 113 110 #endif 111 + 112 + extern struct mca_config mca_cfg; 113 + 114 + #endif /* __X86_MCE_INTERNAL_H__ */
+2
arch/x86/kernel/cpu/mcheck/mce_amd.c
··· 28 28 #include <asm/msr.h> 29 29 #include <asm/trace/irq_vectors.h> 30 30 31 + #include "mce-internal.h" 32 + 31 33 #define NR_BLOCKS 5 32 34 #define THRESHOLD_MAX 0xFFF 33 35 #define INT_TYPE_APIC 0x00020000
+1 -1
drivers/ras/cec.c
··· 523 523 if (*str == '=') 524 524 str++; 525 525 526 - if (!strncmp(str, "cec_disable", 7)) 526 + if (!strcmp(str, "cec_disable")) 527 527 ce_arr.disabled = 1; 528 528 else 529 529 return 0;