From 2ca521b3fa3402a815b49b3e9a0583c5a36e94ac Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 4 Nov 2007 17:50:12 -0800
Subject: [PATCH] --- yaml --- r: 73116 b: refs/heads/master c:
 7ed192906a2144ebc8ca2925a85d27b9c5355668 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/boot/pmjump.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ec1731b317c..be7a3a8d91fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b55d1b1814c52463c11707f53dbdc223e09b2924
+refs/heads/master: 7ed192906a2144ebc8ca2925a85d27b9c5355668
diff --git a/trunk/arch/x86/boot/pmjump.S b/trunk/arch/x86/boot/pmjump.S
index 2e559233725a..26baeab3a4d4 100644
--- a/trunk/arch/x86/boot/pmjump.S
+++ b/trunk/arch/x86/boot/pmjump.S
@@ -31,14 +31,14 @@ protected_mode_jump:
 	xorl	%ebx, %ebx		# Flag to indicate this is a boot
 	movl	%edx, %esi		# Pointer to boot_params table
 	movl	%eax, 2f		# Patch ljmpl instruction
-	jmp	1f			# Short jump to flush instruction q.
 
-1:
 	movw	$__BOOT_DS, %cx
 
 	movl	%cr0, %edx
 	orb	$1, %dl			# Protected mode (PE) bit
 	movl	%edx, %cr0
+	jmp	1f			# Short jump to serialize on 386/486
+1:
 
 	movw	%cx, %ds
 	movw	%cx, %es