]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
* grub-core/kern/i386/realmode.S: Increase alignment.
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 15 Dec 2011 18:17:36 +0000 (19:17 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Thu, 15 Dec 2011 18:17:36 +0000 (19:17 +0100)
* grub-core/boot/i386/pc/startup_raw.S: Likewise.

grub-core/boot/i386/pc/startup_raw.S
grub-core/kern/i386/realmode.S

index 9e0f23d714bfada957209122b3b95454a4e16c2c..3fae1e4e1a0b1e7f791db654ac49ab4f71999da1 100644 (file)
@@ -341,6 +341,6 @@ gate_a20_check_state:
 #include "lzma_decode.S"
 #endif
 
-       .p2align 2
+       .p2align 4
 
 LOCAL(decompressor_end):
index 2e16847c8bed19a20ed092fe5d785177c9cda478..36d41e7dea66e44fd1b2e98ca16b8ef5d83c29b0 100644 (file)
@@ -46,7 +46,7 @@
  *  This is the area for all of the special variables.
  */
 
-       .p2align        2       /* force 4-byte alignment */
+       .p2align        5       /* force 4-byte alignment */
 
 protstack:
        .long   GRUB_MEMORY_MACHINE_PROT_STACK
@@ -79,7 +79,7 @@ protstack:
  *  description.
  */
 
-       .p2align        2       /* force 4-byte alignment */
+       .p2align        5       /* force 4-byte alignment */
 gdt:
        .word   0, 0
        .byte   0, 0, 0, 0
@@ -113,6 +113,7 @@ gdt:
        .byte   0, 0x92, 0, 0
 
 
+       .p2align 5
 /* this is the GDT descriptor */
 gdtdesc:
        .word   0x27                    /* limit */