* 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.

diff --git a/ChangeLog b/ChangeLog
index b0bed2c37d7dc369ac8742896f2eaf2cbb773153..9b7caa65c583f10f00ed7a28e265613b7acd2bca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/net/net.c (grub_net_addr_to_str): Don't translate

diff --git a/grub-core/boot/i386/pc/startup_raw.S b/grub-core/boot/i386/pc/startup_raw.S
index 952cd814a93ffd14034b9582b32fb1b58eecf1ed..2147ddeaf3eed7211b9beb874afc07ff3d474051 100644 (file)
--- a/grub-core/boot/i386/pc/startup_raw.S
+++ b/grub-core/boot/i386/pc/startup_raw.S
@@ -303,7 +303,7 @@ multiboot_entry:
        movl    %ebp, %esp
 
        /* relocate the code */
-       movl    $(LOCAL(decompressor_end) + 0x200), %ecx
+       movl    $(LOCAL(decompressor_end) - _start + 0x200), %ecx
        addl    LOCAL(compressed_size) - _start + 0x100000 + 0x200, %ecx
        movl    $0x100000, %esi
        movl    $GRUB_BOOT_MACHINE_KERNEL_ADDR, %edi

diff --git a/grub-core/kern/i386/realmode.S b/grub-core/kern/i386/realmode.S
index 0b6190337f80620113a2c7b5389c8ce6b2273c04..6403b96992e1aa8a94bdcdef1631b764cbb49e8d 100644 (file)
--- a/grub-core/kern/i386/realmode.S
+++ b/grub-core/kern/i386/realmode.S
@@ -117,7 +117,7 @@ gdtdesc:
        .word   0x27                    /* limit */
        .long   gdt                     /* addr */
 LOCAL(realidt):
-       .word 0
+       .word 0x400
        .long 0
 protidt:
        .word 0