Commit 21afaf18 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/mce: Streamline MCE subsystem's naming 



Rename the containing folder to "mce" which is the most widespread name.
Drop the "mce[-_]" filename prefix of some compilation units (while
others don't have it).

This unifies the file naming in the MCE subsystem:

mce/
|-- amd.c
|-- apei.c
|-- core.c
|-- dev-mcelog.c
|-- genpool.c
|-- inject.c
|-- intel.c
|-- internal.h
|-- Makefile
|-- p5.c
|-- severity.c
|-- therm_throt.c
|-- threshold.c
`-- winchip.c

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lkml.kernel.org/r/20181205141323.14995-1-bp@alien8.de
parent 25956467

arch/x86/kernel/cpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ obj-$(CONFIG_INTEL_RDT) += intel_rdt.o intel_rdt_rdtgroup.o intel_rdt_monitor.o 
obj-$(CONFIG_INTEL_RDT)	+= intel_rdt_ctrlmondata.o intel_rdt_pseudo_lock.o

CFLAGS_intel_rdt_pseudo_lock.o = -I$(src)



obj-$(CONFIG_X86_MCE)			+= mcheck/

obj-$(CONFIG_X86_MCE)			+= mce/

obj-$(CONFIG_MTRR)			+= mtrr/

obj-$(CONFIG_MICROCODE)			+= microcode/

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

+5 −5
Original line number Diff line number Diff line 
# 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_MCE_INTEL)	+= mce_intel.o

obj-$(CONFIG_X86_MCE_AMD)	+= mce_amd.o

obj-$(CONFIG_X86_MCE_INTEL)	+= intel.o

obj-$(CONFIG_X86_MCE_AMD)	+= amd.o

obj-$(CONFIG_X86_MCE_THRESHOLD) += threshold.o

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

obj-$(CONFIG_X86_MCE_INJECT)	+= inject.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

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

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

#include <asm/trace/irq_vectors.h>



#include "mce-internal.h"

#include "internal.h"



#define NR_BLOCKS         5

#define THRESHOLD_MAX     0xFFF

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <acpi/ghes.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)

{

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

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

#include <asm/reboot.h>



#include "mce-internal.h"

#include "internal.h"



static DEFINE_MUTEX(mce_log_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE