diff options
author | Christian Volkmann <haveaniceday@cv-sv.de> | 2007-05-21 08:31:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 12:56:57 -0400 |
commit | 4c1f59d8be7e5da75d9380da23671005b363c45c (patch) | |
tree | ae5370ca50c86aa16d0b20fdb30cbbbb8921e8ef | |
parent | c12ceb766eb5ac975c1145d51236fcdcf81a6578 (diff) |
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 <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/i386/boot/setup.S | 2 |
1 files changed, 2 insertions, 0 deletions
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: | |||
310 | call verify_cpu | 310 | call verify_cpu |
311 | testl %eax,%eax | 311 | testl %eax,%eax |
312 | jz cpu_ok | 312 | jz cpu_ok |
313 | movw %cs,%ax # aka SETUPSEG | ||
314 | movw %ax,%ds | ||
313 | lea cpu_panic_mess,%si | 315 | lea cpu_panic_mess,%si |
314 | call prtstr | 316 | call prtstr |
315 | 1: jmp 1b | 317 | 1: jmp 1b |