Commit 8e97be2a 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 RAS updates from Borislav Petkov:
 "The latest meager RAS updates:

   - Enable processing of action-optional MCEs which have the Overflow
     bit set (Tony Luck)

   - -Wmissing-prototypes warning fix and a build fix (Valdis
     Klētnieks)"

* 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  RAS: Build debugfs.o only when enabled in Kconfig
  RAS: Fix prototype warnings
  x86/mce: Don't check for the overflow bit on action optional machine checks
parents ff881842 b6ff24f7

arch/x86/kernel/cpu/mce/severity.c

+2 −2
Original line number Diff line number Diff line
@@ -107,11 +107,11 @@ static struct severity { 
	 */

	MCESEV(

		AO, "Action optional: memory scrubbing error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_AR|MCACOD_SCRUBMSK, MCI_STATUS_UC|MCACOD_SCRUB)

		SER, MASK(MCI_UC_AR|MCACOD_SCRUBMSK, MCI_STATUS_UC|MCACOD_SCRUB)

		),

	MCESEV(

		AO, "Action optional: last level cache writeback error",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_AR|MCACOD, MCI_STATUS_UC|MCACOD_L3WB)

		SER, MASK(MCI_UC_AR|MCACOD, MCI_STATUS_UC|MCACOD_L3WB)

		),



	/* ignore OVER for UCNA */

drivers/ras/Makefile

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_RAS)	+= ras.o debugfs.o

obj-$(CONFIG_RAS)	+= ras.o

obj-$(CONFIG_DEBUG_FS)	+= debugfs.o

obj-$(CONFIG_RAS_CEC)	+= cec.o

drivers/ras/cec.c

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */

#include <linux/mm.h>

#include <linux/gfp.h>

#include <linux/ras.h>

#include <linux/kernel.h>

#include <linux/workqueue.h>

drivers/ras/debugfs.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/debugfs.h>

#include <linux/ras.h>

#include "debugfs.h"



struct dentry *ras_debugfs_dir;

CRA Git | Maintained and supported by SUSTech CRA and CCSE