ia64/xen-unstable

changeset 3690:177865f3143e

bitkeeper revision 1.1159.212.107 (420757d1DdfFUXGMssAN0f_k_jSJvA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Mon Feb 07 11:58:09 2005 +0000 (2005-02-07)
parents 7db5b671b347 ef95f070a233
children f38875b9c89f 3d2ed612bf7a
files xen/arch/x86/boot/mkelf32.c
line diff
     1.1 --- a/xen/arch/x86/boot/mkelf32.c	Sun Feb 06 21:30:19 2005 +0000
     1.2 +++ b/xen/arch/x86/boot/mkelf32.c	Mon Feb 07 11:58:09 2005 +0000
     1.3 @@ -245,6 +245,12 @@ int main(int argc, char **argv)
     1.4          return 1;
     1.5      }
     1.6  
     1.7 +    /*
     1.8 +     * End the image on a page boundary. This gets round alignment bugs
     1.9 +     * in the boot- or chain-loader (e.g., kexec on the XenoBoot CD).
    1.10 +     */
    1.11 +    mem_siz += -(loadbase + mem_siz) & 0xfff;
    1.12 +
    1.13      out_ehdr.e_entry = loadbase;
    1.14      out_ehdr.e_shoff = RAW_OFFSET + dat_siz;
    1.15