Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b764ced authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 26c923ab 262e6811

arch/x86/include/asm/mce.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,6 @@ struct mca_msr_regs { 




extern struct mce_vendor_flags mce_flags;

extern struct mce_vendor_flags mce_flags;





extern struct mca_config mca_cfg;

extern struct mca_msr_regs msr_ops;

extern struct mca_msr_regs msr_ops;





enum mce_notifier_prios {

enum mce_notifier_prios {

arch/x86/kernel/cpu/mcheck/mce-internal.h

+7 −0
Original line number Original line Diff line number Diff line 
#ifndef __X86_MCE_INTERNAL_H__

#define __X86_MCE_INTERNAL_H__



#include <linux/device.h>

#include <linux/device.h>

#include <asm/mce.h>

#include <asm/mce.h>
@@ -108,3 +111,7 @@ static inline void mce_work_trigger(void) { } 
static inline void mce_register_injector_chain(struct notifier_block *nb)	{ }

static inline void mce_register_injector_chain(struct notifier_block *nb)	{ }

static inline void mce_unregister_injector_chain(struct notifier_block *nb)	{ }

static inline void mce_unregister_injector_chain(struct notifier_block *nb)	{ }

#endif

#endif



extern struct mca_config mca_cfg;



#endif /* __X86_MCE_INTERNAL_H__ */

arch/x86/kernel/cpu/mcheck/mce_amd.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <asm/msr.h>

#include <asm/msr.h>

#include <asm/trace/irq_vectors.h>

#include <asm/trace/irq_vectors.h>





#include "mce-internal.h"



#define NR_BLOCKS         5

#define NR_BLOCKS         5

#define THRESHOLD_MAX     0xFFF

#define THRESHOLD_MAX     0xFFF

#define INT_TYPE_APIC     0x00020000

#define INT_TYPE_APIC     0x00020000

drivers/ras/cec.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -523,7 +523,7 @@ int __init parse_cec_param(char *str) 
	if (*str == '=')

	if (*str == '=')

		str++;

		str++;





	if (!strncmp(str, "cec_disable", 7))

	if (!strcmp(str, "cec_disable"))

		ce_arr.disabled = 1;

		ce_arr.disabled = 1;

	else

	else

		return 0;

		return 0;