vserver 1.9.5.x5

[linux-2.6.git] / arch / x86_64 / boot / setup.S

diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
index fc52ed8..3e838be 100644 (file)
--- a/arch/x86_64/boot/setup.S
+++ b/arch/x86_64/boot/setup.S
@@ -158,7 +158,9 @@ cmd_line_ptr:       .long 0                 # (Header version 0x0202 or later)
 ramdisk_max:   .long 0xffffffff
        
 trampoline:    call    start_of_setup
-               .space  1024
+               .align 16
+                                       # The offset at this point is 0x240
+               .space  (0x7ff-0x240+1) # E820 & EDD space (ending at 0x7ff)
 # End of setup header #####################################################
 
 start_of_setup: