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

	jump.

diff --git a/ChangeLog b/ChangeLog
index 86b3f30a3f9a64a6b39287dbfd45f22fc7756cd6..6120e9e65eeb2324c705e1dd7b468680e7d8ee22 100644 (file)
--- 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 6b43d9f1489dd55c5508459eb803582ed3b11f49..d089a3e154424dd0eee4ee19109f544086c10075 100644 (file)
--- 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: