From: Christian Volkmann Date: Mon, 21 May 2007 12:31:48 +0000 (+0200) Subject: i386: Fix wrong CPU error message in early boot path X-Git-Tag: v2.6.22-rc3~118 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4c1f59d8be7e5da75d9380da23671005b363c45c i386: Fix wrong CPU error message in early boot path - boot/setup.S did not print "PANIC: CPU too old for this kernel" ( not visible, also the message did not match ) - I add "# missed before: set ds" => somebody should check if I am right with the way to set. => seems to be a generic error in setup.S not to set "ds" for error messages. AK: extracted patch out of other changes AK: also couldn't find any other case where ds is wrong Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index f8b3b9cda2b1..6dbcc95b2120 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S @@ -310,6 +310,8 @@ loader_ok: call verify_cpu testl %eax,%eax jz cpu_ok + movw %cs,%ax # aka SETUPSEG + movw %ax,%ds lea cpu_panic_mess,%si call prtstr 1: jmp 1b