vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/boot/i386/pc/startup_raw.S (multiboot_trampoline): Fix

Browse source 
size calculation.
	* grub-core/kern/i386/realmode.S (realidt): Assume default BIOS IDT if
	none is known.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-08 18:54:25 +01:00
parent 55b20e588c
commit 52bfedfa39
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-03-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/boot/i386/pc/startup_raw.S (multiboot_trampoline): Fix
size calculation.
* grub-core/kern/i386/realmode.S (realidt): Assume default BIOS IDT if
none is known.
2012-03-08 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-08 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/net.c (grub_net_addr_to_str): Don't translate * grub-core/net/net.c (grub_net_addr_to_str): Don't translate

2
grub-core/boot/i386/pc/startup_raw.S
View file

@ -303,7 +303,7 @@ multiboot_entry:
movl %ebp, %esp movl %ebp, %esp
/* relocate the code */ /* relocate the code */
movl $(LOCAL(decompressor_end) + 0x200), %ecx movl $(LOCAL(decompressor_end) - _start + 0x200), %ecx
addl LOCAL(compressed_size) - _start + 0x100000 + 0x200, %ecx addl LOCAL(compressed_size) - _start + 0x100000 + 0x200, %ecx
movl $0x100000, %esi movl $0x100000, %esi
movl $GRUB_BOOT_MACHINE_KERNEL_ADDR, %edi movl $GRUB_BOOT_MACHINE_KERNEL_ADDR, %edi

2
grub-core/kern/i386/realmode.S
View file

@ -117,7 +117,7 @@ gdtdesc:
.word 0x27 /* limit */ .word 0x27 /* limit */
.long gdt /* addr */ .long gdt /* addr */
LOCAL(realidt): LOCAL(realidt):
.word 0 .word 0x400
.long 0 .long 0
protidt: protidt:
.word 0 .word 0