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

Commit 575ca735 authored by Vegard Nossum's avatar Vegard Nossum Committed by Ingo Molnar
Browse files

x86: fix early-BUG message 



The .asciz directive takes any number of strings, but each one is zero-
terminated, and string pasting is not done as in C. That results in only the
first line being output.

Replace .asciz with multiple .ascii directives and terminate with .asciz.

Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b4cdc430

arch/x86/kernel/head_32.S

+10 −9
Original line number Diff line number Diff line
@@ -656,15 +656,16 @@ int_msg: 
	.asciz "Unknown interrupt or fault at EIP %p %p %p\n"



fault_msg:

	.asciz								\

/* fault info: */	"BUG: Int %d: CR2 %p\n"				\

/* pusha regs: */	"     EDI %p  ESI %p  EBP %p  ESP %p\n"		\

			"     EBX %p  EDX %p  ECX %p  EAX %p\n"		\

/* fault frame: */	"     err %p  EIP %p   CS %p  flg %p\n"		\

									\

			"Stack: %p %p %p %p %p %p %p %p\n"		\

			"       %p %p %p %p %p %p %p %p\n"		\

			"       %p %p %p %p %p %p %p %p\n"

/* fault info: */

	.ascii "BUG: Int %d: CR2 %p\n"

/* pusha regs: */

	.ascii "     EDI %p  ESI %p  EBP %p  ESP %p\n"

	.ascii "     EBX %p  EDX %p  ECX %p  EAX %p\n"

/* fault frame: */

	.ascii "     err %p  EIP %p   CS %p  flg %p\n"

	.ascii "Stack: %p %p %p %p %p %p %p %p\n"

	.ascii "       %p %p %p %p %p %p %p %p\n"

	.asciz "       %p %p %p %p %p %p %p %p\n"



#include "../../x86/xen/xen-head.S"