x86: fix early-BUG message
PATCH 1/1 x86: fix early-BUG message
Quoted 1 line
From
e7402e1c6b56dfb8d389f1faf04b3f03a9ecad33Mon Sep 17 00:00:00 2001
From: Vegard Nossum <[email protected]>
Date: Fri, 25 Apr 2008 20:58:34 +0200
Subject: [PATCH] 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 Vegard Nossum <[email protected]>
--- arch/x86/kernel/head_32.S | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
arch/x86/kernel/head_32.S +10 -9
@@ -657,15 +657,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"
Signature · 1 line
1.5.4.1
Ingo Molnar
AppliedQuoted 6 lines · Vegard Nossum
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.
applied, thanks Vegard.
Ingo