From e49d09e1d60f2eeb38a339c365aaa0b8dad7527e Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 30 Jun 2008 15:42:47 -0700
Subject: [PATCH] --- yaml --- r: 99586 b: refs/heads/master c:
 2ee2394b682c0ee99b0f083abe6c57727e6edb69 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 c446d21e6ab4..41ce5ab49611 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 908ec7afacfdc83dc10938ed1d3c38b3526034ec
+refs/heads/master: 2ee2394b682c0ee99b0f083abe6c57727e6edb69
diff --git a/trunk/arch/x86/boot/pmjump.S b/trunk/arch/x86/boot/pmjump.S
index ab049d40a884..141b6e20ed31 100644
--- a/trunk/arch/x86/boot/pmjump.S
+++ b/trunk/arch/x86/boot/pmjump.S
@@ -33,6 +33,8 @@ protected_mode_jump:
 	movw	%cs, %bx
 	shll	$4, %ebx
 	addl	%ebx, 2f
+	jmp	1f			# Short jump to serialize on 386/486
+1:
 
 	movw	$__BOOT_DS, %cx
 	movw	$__BOOT_TSS, %di
@@ -40,8 +42,6 @@ protected_mode_jump:
 	movl	%cr0, %edx
 	orb	$X86_CR0_PE, %dl	# Protected mode
 	movl	%edx, %cr0
-	jmp	1f			# Short jump to serialize on 386/486
-1:
 
 	# Transition to 32-bit mode
 	.byte	0x66, 0xea		# ljmpl opcode