X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fx86_64%2Fboot%2Fsetup.S;h=3e838be9dbe78ba53933c5ef910bec2219a9ef37;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=fc52ed8012ee1a0e40a7bff976039c80a6a71364;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S index fc52ed801..3e838be9d 100644 --- 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: