Messages in this thread | | | Date | Mon, 31 Oct 2016 11:57:42 +0100 | From | Borislav Petkov <> | Subject | Re: [RFC PATCH] x86: Do not panic if mce=2 is passed |
| |
On Fri, Sep 16, 2016 at 01:23:25PM -0700, Yinghai Lu wrote: > From: Yinghai Lu <yinghai.lu@oracle.com> > > For UE recovery support, current we need mce=2 in command line > and also disable panic_on_oops with sysctl. > > but other user may still need to have panic_on_oops to 1 always. > > We can remove checking of panic_on_oops for mce-severity path. > > We should be ok as on default path when mce=2 is not passed, tolerant > is 0, so they will still get MCE_PANIC_SEVERITY returned. > > Signed-off-by: Yinghai Lu <yinghai.lu@oracle.com> > > > --- > arch/x86/kernel/cpu/mcheck/mce-severity.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c > =================================================================== > --- linux-2.6.orig/arch/x86/kernel/cpu/mcheck/mce-severity.c > +++ linux-2.6/arch/x86/kernel/cpu/mcheck/mce-severity.c > @@ -311,7 +311,7 @@ static int mce_severity_intel(struct mce > *msg = s->msg; > s->covered = 1; > if (s->sev >= MCE_UC_SEVERITY && ctx == IN_KERNEL) { > - if (panic_on_oops || tolerant < 1) > + if (tolerant < 1) > return MCE_PANIC_SEVERITY; > } > return s->sev;
Applied, thanks.
-- Regards/Gruss, Boris.
ECO tip #101: Trim your mails when you reply.
| |