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

Commit eed9688f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 RAS updates from Borislav Petkov:
 "This time around we have a subsystem reorganization to offer, with the
  new directory being

    arch/x86/kernel/cpu/mce/

  and all compilation units' names streamlined under it"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Restore MCE injector's module name
  x86/mce: Unify pr_* prefix
  x86/mce: Streamline MCE subsystem's naming
parents 72af8415 72a8f089

arch/x86/kernel/cpu/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o 
obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o

obj-$(CONFIG_CPU_SUP_TRANSMETA_32)	+= transmeta.o

obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o

obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o





obj-$(CONFIG_X86_MCE)			+= mcheck/

obj-$(CONFIG_X86_MCE)			+= mce/

obj-$(CONFIG_MTRR)			+= mtrr/

obj-$(CONFIG_MTRR)			+= mtrr/

obj-$(CONFIG_MICROCODE)			+= microcode/

obj-$(CONFIG_MICROCODE)			+= microcode/

obj-$(CONFIG_RESCTRL)			+= resctrl/

obj-$(CONFIG_RESCTRL)			+= resctrl/

arch/x86/kernel/cpu/mcheck/Makefile→arch/x86/kernel/cpu/mce/Makefile

+6 −4
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# SPDX-License-Identifier: GPL-2.0

obj-y				=  mce.o mce-severity.o mce-genpool.o

obj-y				=  core.o severity.o genpool.o





obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o

obj-$(CONFIG_X86_ANCIENT_MCE)	+= winchip.o p5.o

obj-$(CONFIG_X86_MCE_INTEL)	+= mce_intel.o

obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o

obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd.o

obj-$(CONFIG_X86_MCE_AMD)	+= amd.o

obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o

obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o



mce-inject-y			:= inject.o

obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o

obj-$(CONFIG_X86_MCE_INJECT)	+= mce-inject.o





obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o

obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o





obj-$(CONFIG_ACPI_APEI)		+= mce-apei.o

obj-$(CONFIG_ACPI_APEI)		+= apei.o





obj-$(CONFIG_X86_MCELOG_LEGACY)	+= dev-mcelog.o
 
obj-$(CONFIG_X86_MCELOG_LEGACY)	+= dev-mcelog.o

arch/x86/kernel/cpu/mcheck/mce_amd.c→arch/x86/kernel/cpu/mce/amd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <asm/msr.h>

#include <asm/msr.h>

#include <asm/trace/irq_vectors.h>

#include <asm/trace/irq_vectors.h>





#include "mce-internal.h"

#include "internal.h"





#define NR_BLOCKS         5

#define NR_BLOCKS         5

#define THRESHOLD_MAX     0xFFF

#define THRESHOLD_MAX     0xFFF

arch/x86/kernel/cpu/mcheck/mce-apei.c→arch/x86/kernel/cpu/mce/apei.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <acpi/ghes.h>

#include <acpi/ghes.h>

#include <asm/mce.h>

#include <asm/mce.h>





#include "mce-internal.h"

#include "internal.h"





void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)

void apei_mce_report_mem_error(int severity, struct cper_sec_mem_err *mem_err)

{

{

arch/x86/kernel/cpu/mcheck/mce.c→arch/x86/kernel/cpu/mce/core.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -8,8 +8,6 @@ 
 * Author: Andi Kleen

 * Author: Andi Kleen

 */

 */





#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/thread_info.h>

#include <linux/thread_info.h>

#include <linux/capability.h>

#include <linux/capability.h>

#include <linux/miscdevice.h>

#include <linux/miscdevice.h>
@@ -52,7 +50,7 @@ 
#include <asm/msr.h>

#include <asm/msr.h>

#include <asm/reboot.h>

#include <asm/reboot.h>





#include "mce-internal.h"

#include "internal.h"





static DEFINE_MUTEX(mce_log_mutex);

static DEFINE_MUTEX(mce_log_mutex);