aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-03-12 14:53:53 +0100
committerIngo Molnar <mingo@elte.hu>2008-03-21 17:06:15 +0100
commite215f3c2c5247b727a76f28de4b3e46def950c55 (patch)
treee56e19e9608dd6cf797f90efdfba858ef0a70e0c /arch
parentx86: fix long standing bug with usb after hibernation with 4GB ram (diff)
downloadlinux-dev-e215f3c2c5247b727a76f28de4b3e46def950c55.tar.xz
linux-dev-e215f3c2c5247b727a76f28de4b3e46def950c55.zip
x86: fix fault_msg nul termination
The fault_msg text is not explictly nul terminated now in startup assembly. Do so by converting .ascii to .asciz. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/head_32.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index fd8ca53943a8..74d87ea85b5c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -657,7 +657,7 @@ int_msg:
.asciz "Unknown interrupt or fault at EIP %p %p %p\n"
fault_msg:
- .ascii \
+ .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" \