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

Commit 940e84fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull MCE fix from Tony Luck:
 "Fix a regression in mce-severity.c"

* tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  x86/mce: Fix mce regression from recent cleanup
parents aa8032b6 1a7f0e3c

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

+2 −2
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ static struct severity { 
#ifdef	CONFIG_MEMORY_FAILURE

	MCESEV(

		KEEP, "Action required but unaffected thread is continuable",

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR|MCACOD, MCI_UC_SAR|MCI_ADDR),

		MCGMASK(MCG_STATUS_RIPV, MCG_STATUS_RIPV)

		SER, MASK(MCI_STATUS_OVER|MCI_UC_SAR|MCI_ADDR, MCI_UC_SAR|MCI_ADDR),

		MCGMASK(MCG_STATUS_RIPV|MCG_STATUS_EIPV, MCG_STATUS_RIPV)

		),

	MCESEV(

		AR, "Action required: data load error in a user process",