Commit 8c911021 authored Mar 02, 2017 by Kyle Yan

arm64: Do not overwrite die message if provided



Do not allow the die function to overwrite the original
error message passed in. Only overwrite if an empty string was
passed in.

Change-Id: I7a719235fb5c081e37d289495ab9c6331728c948
Signed-off-by: Kyle Yan <kyan@codeaurora.org>

parent e713c9df

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);