From c522667199a419285987097fe35ea135d91a82d3 Mon Sep 17 00:00:00 2001
From: Christian Volkmann <haveaniceday@cv-sv.de>
Date: Mon, 21 May 2007 14:31:48 +0200
Subject: [PATCH] --- yaml --- r: 56672 b: refs/heads/master c:
 4c1f59d8be7e5da75d9380da23671005b363c45c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/boot/setup.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d565cc2cf673..fff216d686ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c12ceb766eb5ac975c1145d51236fcdcf81a6578
+refs/heads/master: 4c1f59d8be7e5da75d9380da23671005b363c45c
diff --git a/trunk/arch/i386/boot/setup.S b/trunk/arch/i386/boot/setup.S
index f8b3b9cda2b1..6dbcc95b2120 100644
--- a/trunk/arch/i386/boot/setup.S
+++ b/trunk/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