Commit b61b82f8 authored by Sangmoon Kim's avatar Sangmoon Kim Committed by Catalin Marinas
Browse files

arm64: pass ESR_ELx to die() of cfi_handler



Commit 0f2cb928 ("arm64: consistently pass ESR_ELx to die()") caused
all callers to pass the ESR_ELx value to die().

For consistency, this patch also adds esr to die() call of cfi_handler.
Also, when CFI error occurs, die handlers can use ESR_ELx value.

Signed-off-by: default avatarSangmoon Kim <sangmoon.kim@samsung.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230220073441.2753-1-sangmoon.kim@samsung.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 0269680e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static int cfi_handler(struct pt_regs *regs, unsigned long esr)

	switch (report_cfi_failure(regs, regs->pc, &target, type)) {
	case BUG_TRAP_TYPE_BUG:
		die("Oops - CFI", regs, 0);
		die("Oops - CFI", regs, esr);
		break;

	case BUG_TRAP_TYPE_WARN: