X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fi386%2Fboot%2Fsetup.S;h=a934ab32bf8e4fcdcc586ff99a075febe8391269;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=5623e821f9905e55a89f483c1e3e1c27f547d669;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S index 5623e821f..a934ab32b 100644 --- a/arch/i386/boot/setup.S +++ b/arch/i386/boot/setup.S @@ -162,7 +162,9 @@ ramdisk_max: .long (-__PAGE_OFFSET-(512 << 20)-1) & 0x7fffffff # the contents of an initrd 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: