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

Commit 84a48e22 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: Do not overwrite die message if provided" into msm-4.9

parents fe532107 8c911021

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ void die(const char *str, struct pt_regs *regs, int err) 


	if (!user_mode(regs))

		bug_type = report_bug(regs->pc, regs);

	if (bug_type != BUG_TRAP_TYPE_NONE)

	if (bug_type != BUG_TRAP_TYPE_NONE && !strlen(str))

		str = "Oops - BUG";



	ret = __die(str, err, thread, regs);