From 5a9649f96a2cbd1cf2b0f533468293ec203eb523 Mon Sep 17 00:00:00 2001 From: Vegard Nossum Date: Fri, 25 Apr 2008 21:02:34 +0200 Subject: [PATCH] --- yaml --- r: 95619 b: refs/heads/master c: 575ca7351bf0546919060071797cccb4a05960df h: refs/heads/master i: 95617: fd4fdec6eb8ed4d7ed3f26eaa30fbdff371ea2ca 95615: 704392144f2a257f0385bb3c61936bc425e836a8 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/head_32.S | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 39651f4d8e22..3d27a1849c99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4cdc4300de6ff7b8b366f23bed17c7d59c8117c +refs/heads/master: 575ca7351bf0546919060071797cccb4a05960df diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S index 90f038af3adc..b2cc73768a9d 100644 --- a/trunk/arch/x86/kernel/head_32.S +++ b/trunk/arch/x86/kernel/head_32.S @@ -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"