From 10001ac54bcd246e98a8894f59d40102f286f1a1 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 12 Nov 2010 08:45:16 +0100 Subject: [PATCH] * grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing jump. --- ChangeLog | 13 ++++++++++--- grub-core/kern/i386/pc/startup.S | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86b3f30a3..6120e9e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,21 @@ +2010-11-12 Vladimir Serbinenko + + * grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing + jump. + 2010-11-08 Manoel Rebelo Abranches - * 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: -- 2.47.3