* grub-core/kern/i386/pc/startup.S (multiboot_trampoline): Add missing
jump.
This commit is contained in:
parent
9c4cf53bfe
commit
10001ac54b
2 changed files with 11 additions and 3 deletions
13
ChangeLog
13
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>
|
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.
|
Return maximum segments alignment.
|
||||||
(grub_elf64_size): Likewise.
|
(grub_elf64_size): Likewise.
|
||||||
* kern/elf.c (grub_elf32_size): New parameter. All users updated.
|
* kern/elf.c (grub_elf32_size): New parameter. All users updated.
|
||||||
Return maximum segments alignment.
|
Return maximum segments alignment.
|
||||||
(grub_elf64_size): Likewise.
|
(grub_elf64_size): Likewise.
|
||||||
* grub-core/loader/powerpc/ieee1275/linux.c:
|
* grub-core/loader/powerpc/ieee1275/linux.c:
|
||||||
(grub_linux_claimmap_iterate): New function. Uses the "available"property
|
(grub_linux_claimmap_iterate): New function. Uses the
|
||||||
in the "memory" node for memory allocation for kernel in the PowerPC loader.
|
"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_load32): Correctly find linux entry point offset.
|
||||||
(grub_linux_load64): Likewise.
|
(grub_linux_load64): Likewise.
|
||||||
|
|
||||||
|
|
|
@ -224,6 +224,7 @@ multiboot_trampoline:
|
||||||
movb $0xFF, %dh
|
movb $0xFF, %dh
|
||||||
/* enter the usual booting */
|
/* enter the usual booting */
|
||||||
call prot_to_real
|
call prot_to_real
|
||||||
|
jmp LOCAL (codestart)
|
||||||
|
|
||||||
post_reed_solomon:
|
post_reed_solomon:
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue