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
......@@ -36,7 +36,7 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.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_MICROCODE) += microcode/
obj-$(CONFIG_RESCTRL) += resctrl/
......
# 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
mce-inject-y := inject.o
obj-$(CONFIG_X86_MCE_INJECT) += mce-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
......@@ -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
......
......@@ -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)
{
......
......@@ -8,8 +8,6 @@
* Author: Andi Kleen
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/thread_info.h>
#include <linux/capability.h>
#include <linux/miscdevice.h>
......@@ -52,7 +50,7 @@
#include <asm/msr.h>
#include <asm/reboot.h>
#include "mce-internal.h"
#include "internal.h"
static DEFINE_MUTEX(mce_log_mutex);
......
......@@ -8,14 +8,12 @@
* Author: Andi Kleen
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/miscdevice.h>
#include <linux/slab.h>
#include <linux/kmod.h>
#include <linux/poll.h>
#include "mce-internal.h"
#include "internal.h"
static BLOCKING_NOTIFIER_HEAD(mce_injector_chain);
......
......@@ -10,7 +10,7 @@
#include <linux/mm.h>
#include <linux/genalloc.h>
#include <linux/llist.h>
#include "mce-internal.h"
#include "internal.h"
/*
* printk() is not safe in MCE context. This is a lock-less memory allocator
......
......@@ -38,7 +38,7 @@
#include <asm/nmi.h>
#include <asm/smp.h>
#include "mce-internal.h"
#include "internal.h"
/*
* Collect all the MCi_XXX settings
......
......@@ -18,7 +18,7 @@
#include <asm/msr.h>
#include <asm/mce.h>
#include "mce-internal.h"
#include "internal.h"
/*
* Support for Intel Correct Machine Check Interrupts. This allows
......
......@@ -2,6 +2,9 @@
#ifndef __X86_MCE_INTERNAL_H__
#define __X86_MCE_INTERNAL_H__
#undef pr_fmt
#define pr_fmt(fmt) "mce: " fmt
#include <linux/device.h>
#include <asm/mce.h>
......
......@@ -14,6 +14,8 @@
#include <asm/mce.h>
#include <asm/msr.h>
#include "internal.h"
/* By default disabled */
int mce_p5_enabled __read_mostly;
......
......@@ -16,7 +16,7 @@
#include <asm/mce.h>
#include <linux/uaccess.h>
#include "mce-internal.h"
#include "internal.h"
/*
* Grade an mce by severity. In general the most severe ones are processed
......
......@@ -30,6 +30,8 @@
#include <asm/msr.h>
#include <asm/trace/irq_vectors.h>
#include "internal.h"
/* How long to wait between reporting thermal events */
#define CHECK_INTERVAL (300 * HZ)
......
......@@ -10,6 +10,8 @@
#include <asm/mce.h>
#include <asm/trace/irq_vectors.h>
#include "internal.h"
static void default_threshold_interrupt(void)
{
pr_err("Unexpected threshold interrupt at vector %x\n",
......
......@@ -13,6 +13,8 @@
#include <asm/mce.h>
#include <asm/msr.h>
#include "internal.h"
/* Machine check handler for WinChip C6: */
static void winchip_machine_check(struct pt_regs *regs, long error_code)
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment