direct-io.hg

changeset 3581:ec53c623cf23

bitkeeper revision 1.1159.212.51 (41fa5cccoJa4CtdiYB99zon6qwiusw)

Merge firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Fri Jan 28 15:39:56 2005 +0000 (2005-01-28)
parents 2266301ae541 3857ec2f2189
children 6d98eb831816
files xen/arch/x86/boot/mkelf32.c xen/arch/x86/x86_32/xen.lds xen/arch/x86/x86_64/xen.lds
line diff
     1.1 --- a/xen/arch/x86/boot/mkelf32.c	Fri Jan 28 15:07:56 2005 +0000
     1.2 +++ b/xen/arch/x86/boot/mkelf32.c	Fri Jan 28 15:39:56 2005 +0000
     1.3 @@ -201,7 +201,7 @@ int main(int argc, char **argv)
     1.4  
     1.5          if ( in32_ehdr.e_phnum != 1 )
     1.6          {
     1.7 -            fprintf(stderr, "Expect precisly 1 program header; found %d.\n",
     1.8 +            fprintf(stderr, "Expect precisely 1 program header; found %d.\n",
     1.9                      (int)in32_ehdr.e_phnum);
    1.10              return 1;
    1.11          }
     2.1 --- a/xen/arch/x86/x86_32/xen.lds	Fri Jan 28 15:07:56 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_32/xen.lds	Fri Jan 28 15:39:56 2005 +0000
     2.3 @@ -64,12 +64,8 @@ SECTIONS
     2.4    __initcall_start = .;
     2.5    .initcall.init : { *(.initcall.init) } :text
     2.6    __initcall_end = .;
     2.7 -  . = ALIGN(4096);
     2.8    __init_end = .;
     2.9  
    2.10 -  . = ALIGN(4096);
    2.11 -  .data.page_aligned : { *(.data.idt) } :text
    2.12 -
    2.13    __bss_start = .;		/* BSS */
    2.14    .bss : {
    2.15  	*(.bss)
     3.1 --- a/xen/arch/x86/x86_64/xen.lds	Fri Jan 28 15:07:56 2005 +0000
     3.2 +++ b/xen/arch/x86/x86_64/xen.lds	Fri Jan 28 15:39:56 2005 +0000
     3.3 @@ -62,12 +62,8 @@ SECTIONS
     3.4    __initcall_start = .;
     3.5    .initcall.init : { *(.initcall.init) } :text
     3.6    __initcall_end = .;
     3.7 -  . = ALIGN(4096);
     3.8    __init_end = .;
     3.9  
    3.10 -  . = ALIGN(4096);
    3.11 -  .data.page_aligned : { *(.data.idt) } :text
    3.12 -
    3.13    __bss_start = .;		/* BSS */
    3.14    .bss : {
    3.15  	*(.bss)