Merge "arm64: Call EDAC error handler on system error" (72b9809d) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm64/kernel/traps.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#include <asm/stacktrace.h>
		#include <asm/exception.h>
		#include <asm/system_misc.h>
		#include <asm/esr.h>
		#include <asm/edac.h>

		#include <trace/events/exception.h>

		@@ -327,6 +329,12 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr)
		info.si_code = ILL_ILLOPC;
		info.si_addr = pc;

		if (esr >> ESR_EL1_EC_SHIFT == ESR_EL1_EC_SERROR) {
		pr_crit("System error detected. ESR.ISS = %08x\n",
		esr & 0xffffff);
		arm64_erp_local_dbe_handler();
		}

		arm64_notify_die("Oops - bad mode", regs, &info, 0);
		}