ia64/xen-unstable

changeset 398:a8cf7c3a5af3

bitkeeper revision 1.184.1.6 (3ead28d4DMQnlaCJRLJR1WVg3GJG4A)

Merge ssh://jws22@gauntlet.cl.cam.ac.uk//usr/groups/xeno/BK/xeno.bk
into cairnwell.research:/home/jws/projects/xen/xeno.bk
author jws@cairnwell.research
date Mon Apr 28 13:12:52 2003 +0000 (2003-04-28)
parents d1688684d94d 8b0a613b55b5
children 9a33c17a47a6
files xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h xenolinux-2.4.21-pre4-sparse/mkbuildtree
line diff
     1.1 --- a/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h	Mon Apr 28 12:42:29 2003 +0000
     1.2 +++ b/xenolinux-2.4.21-pre4-sparse/include/asm-xeno/hypervisor.h	Mon Apr 28 13:12:52 2003 +0000
     1.3 @@ -11,7 +11,7 @@
     1.4  
     1.5  #include <asm/hypervisor-ifs/hypervisor-if.h>
     1.6  #include <asm/ptrace.h>
     1.7 -#include <asm/page.h>
     1.8 +//#include <asm/page.h>
     1.9  
    1.10  /* arch/xeno/kernel/setup.c */
    1.11  union start_info_union
     2.1 --- a/xenolinux-2.4.21-pre4-sparse/mkbuildtree	Mon Apr 28 12:42:29 2003 +0000
     2.2 +++ b/xenolinux-2.4.21-pre4-sparse/mkbuildtree	Mon Apr 28 13:12:52 2003 +0000
     2.3 @@ -23,6 +23,7 @@ rm -f ${D}/mkbuildtree
     2.4  ## subdirectories.
     2.5  
     2.6  # This first symlink is special: it links to shared files in Xen's source tree
     2.7 +rm -f ${D}/include/asm-xeno/hypervisor-ifs
     2.8  ln -sf `pwd`/../xen/include/hypervisor-ifs ${D}/include/asm-xeno/hypervisor-ifs
     2.9  
    2.10  # The remainder are the i386 -> xeno-i386 links