From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Nov 2010 07:45:16 +0000 (+0100)
Subject: 	* grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing
X-Git-Tag: 1.99~341
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10001ac54bcd246e98a8894f59d40102f286f1a1;p=thirdparty%2Fgrub.git

	* grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing
	jump.
---

diff --git a/ChangeLog b/ChangeLog
index 86b3f30a3..6120e9e65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,21 @@
+2010-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing
+	jump.
+
 2010-11-08  Manoel Rebelo Abranches <mrabran@br.ibm.com>
 
-	* include/grub/elfload.h (grub_elf32_size): New parameter. All users updated.
+	* include/grub/elfload.h (grub_elf32_size): New parameter.
+	All users updated.
 	Return maximum segments alignment.
 	(grub_elf64_size): Likewise.
 	* kern/elf.c (grub_elf32_size): New parameter. All users updated.
 	Return maximum segments alignment.
 	(grub_elf64_size): Likewise.
 	* grub-core/loader/powerpc/ieee1275/linux.c:
-	(grub_linux_claimmap_iterate): New function. Uses the "available"property 
-	in the "memory" node for memory allocation for kernel in the PowerPC loader.
+	(grub_linux_claimmap_iterate): New function. Uses the
+	"available" property in the "memory" node for memory allocation
+	for kernel in the PowerPC loader.
 	(grub_linux_load32): Correctly find linux entry point offset.
 	(grub_linux_load64): Likewise.
 
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index 6b43d9f14..d089a3e15 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -224,6 +224,7 @@ multiboot_trampoline:
         movb    $0xFF, %dh
 	/* enter the usual booting */
 	call	prot_to_real
+	jmp     LOCAL (codestart)
 
 post_reed_solomon: