From a51dab13287f76f9f27e06467bb19d6bec2cceb1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Feb 2012 10:12:18 +0100
Subject: [PATCH] 	* grub-core/lib/i386/relocator16.S
 (grub_relocator16_start): Move switch 	to real mode down to execute
 A20-related code in protected mode as 	intended.

---
 ChangeLog                        |  6 ++++
 grub-core/lib/i386/relocator16.S | 62 ++++++++++++++++----------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 078d2aecc..09777c513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/i386/relocator16.S (grub_relocator16_start): Move switch
+	to real mode down to execute A20-related code in protected mode as
+	intended.
+
 2012-02-05  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* grub-core/disk/diskfilter.c (grub_diskfilter_make_raid): Return
diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S
index babe69e1d..8500c2f94 100644
--- a/grub-core/lib/i386/relocator16.S
+++ b/grub-core/lib/i386/relocator16.S
@@ -63,37 +63,6 @@ VARIABLE(grub_relocator16_start)
 	andl	$(~GRUB_MEMORY_CPU_CR4_PAE_ON), %eax
 	movl	%eax, %cr4
 
-	/* Update other registers. */
-	movl	$PSEUDO_REAL_DSEG, %eax
-	movl	%eax, %ds
-	movl	%eax, %es
-	movl	%eax, %fs
-	movl	%eax, %gs
-	movl	%eax, %ss
-
-	movl 	%esi, %eax
-	shrl	$4, %eax
-	movw	%ax, (LOCAL (segment) - LOCAL (base)) (%esi, 1)
-	
-	/* jump to a 16 bit segment */
-	ljmp	$PSEUDO_REAL_CSEG, $(LOCAL (cont2) - LOCAL(base))
-LOCAL(cont2):
-	.code16
-
-	/* clear the PE bit of CR0 */
-	movl	%cr0, %eax
-	andl 	$(~GRUB_MEMORY_CPU_CR0_PE_ON), %eax
-	movl	%eax, %cr0
-
-	/* flush prefetch queue, reload %cs */
-	/* ljmp  */
-	.byte	0xea
-	.word 	LOCAL(cont3)-LOCAL(base)
-LOCAL(segment):
-	.word	0
-
-LOCAL(cont3):
-
 	/* movw imm16, %ax.  */
 	.byte	0xb8
 VARIABLE(grub_relocator16_keep_a20_enabled)
@@ -172,6 +141,37 @@ LOCAL(gate_a20_check_state):
 	ret
 
 LOCAL(gate_a20_done):
+	/* Update other registers. */
+	movl	$PSEUDO_REAL_DSEG, %eax
+	movl	%eax, %ds
+	movl	%eax, %es
+	movl	%eax, %fs
+	movl	%eax, %gs
+	movl	%eax, %ss
+
+	movl 	%esi, %eax
+	shrl	$4, %eax
+	movw	%ax, (LOCAL (segment) - LOCAL (base)) (%esi, 1)
+	
+	/* jump to a 16 bit segment */
+	ljmp	$PSEUDO_REAL_CSEG, $(LOCAL (cont2) - LOCAL(base))
+LOCAL(cont2):
+	.code16
+
+	/* clear the PE bit of CR0 */
+	movl	%cr0, %eax
+	andl 	$(~GRUB_MEMORY_CPU_CR0_PE_ON), %eax
+	movl	%eax, %cr0
+
+	/* flush prefetch queue, reload %cs */
+	/* ljmp  */
+	.byte	0xea
+	.word 	LOCAL(cont3)-LOCAL(base)
+LOCAL(segment):
+	.word	0
+
+LOCAL(cont3):
+
 	/* we are in real mode now
 	 * set up the real mode segment registers : DS, SS, ES
 	 */