ia64/xen-unstable

changeset 5296:b0455190b578

bitkeeper revision 1.1657 (429fb3bdy_w-Djv7N3uJ1qp_Sdc2cQ)

domain.h, xenmem.c, mkbuildtree, slab.h, setup.c:
Fix ia64 build.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@freefall.cl.cam.ac.uk
date Fri Jun 03 01:34:53 2005 +0000 (2005-06-03)
parents b30c01053d34
children cc7982c93f34
files .rootkeys xen/arch/ia64/patch/linux-2.6.11/setup.c xen/arch/ia64/tools/mkbuildtree xen/arch/ia64/xenmem.c xen/include/asm-ia64/domain.h xen/include/asm-ia64/slab.h
line diff
     1.1 --- a/.rootkeys	Fri Jun 03 01:15:33 2005 +0000
     1.2 +++ b/.rootkeys	Fri Jun 03 01:34:53 2005 +0000
     1.3 @@ -1275,6 +1275,7 @@ 421098b72bPUyviWloEAIB85dGCm2Q xen/inclu
     1.4  421098b7Z6OwjZnrTZkh34DoDfcjrA xen/include/asm-ia64/regionreg.h
     1.5  421098b707cY5YluUcWK5Pc-71ETVw xen/include/asm-ia64/regs.h
     1.6  4214e2f3fbO_n9Z1kIcBR83d7W4OJw xen/include/asm-ia64/serial.h
     1.7 +429fb3bc53qJOyKJCBfhDNmTasj8Gw xen/include/asm-ia64/slab.h
     1.8  421098b7GkWOnlzSmPvNAhByOSZ1Dw xen/include/asm-ia64/time.h
     1.9  421098b7FK3xgShpnH0I0Ou3O4fJ2Q xen/include/asm-ia64/tlb.h
    1.10  421098b78IGdFOGUlPmpS7h_QBmoFg xen/include/asm-ia64/vcpu.h
     2.1 --- a/xen/arch/ia64/patch/linux-2.6.11/setup.c	Fri Jun 03 01:15:33 2005 +0000
     2.2 +++ b/xen/arch/ia64/patch/linux-2.6.11/setup.c	Fri Jun 03 01:34:53 2005 +0000
     2.3 @@ -1,12 +1,13 @@
     2.4  --- /home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/../../linux-2.6.11/arch/ia64/kernel/setup.c	2005-03-01 23:37:49.000000000 -0800
     2.5  +++ /home/adsharma/disk2/xen-ia64/xeno-unstable-rebase.bk/xen/arch/ia64/setup.c	2005-05-18 12:40:50.000000000 -0700
     2.6 -@@ -51,6 +51,9 @@
     2.7 +@@ -51,6 +51,10 @@
     2.8   #include <asm/smp.h>
     2.9   #include <asm/system.h>
    2.10   #include <asm/unistd.h>
    2.11  +#ifdef CONFIG_VTI
    2.12  +#include <asm/vmx.h>
    2.13  +#endif // CONFIG_VTI
    2.14 ++#include <asm/io.h>
    2.15   
    2.16   #if defined(CONFIG_SMP) && (IA64_CPU_SIZE > PAGE_SIZE)
    2.17   # error "struct cpuinfo_ia64 too big!"
     3.1 --- a/xen/arch/ia64/tools/mkbuildtree	Fri Jun 03 01:15:33 2005 +0000
     3.2 +++ b/xen/arch/ia64/tools/mkbuildtree	Fri Jun 03 01:34:53 2005 +0000
     3.3 @@ -48,6 +48,7 @@ mkdir include/asm-ia64/linux/byteorder
     3.4  # use "gcc -Iinclude/asm-ia64" to find these linux includes
     3.5  #ln -s $XEN/include/xen $XEN/include/linux
     3.6  #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
     3.7 +ln -s ../slab.h include/asm-ia64/linux/slab.h
     3.8  
     3.9  # prepare for building asm-offsets (circular dependency)
    3.10  #echo '#define IA64_TASK_SIZE 0' > include/asm-ia64/asm-offsets.h
     4.1 --- a/xen/arch/ia64/xenmem.c	Fri Jun 03 01:15:33 2005 +0000
     4.2 +++ b/xen/arch/ia64/xenmem.c	Fri Jun 03 01:34:53 2005 +0000
     4.3 @@ -11,6 +11,7 @@
     4.4  
     4.5  #include <linux/config.h>
     4.6  #include <asm/pgtable.h>
     4.7 +#include <asm/mm.h>
     4.8  
     4.9  extern struct page *zero_page_memmap_ptr;
    4.10  struct pfn_info *frame_table;
     5.1 --- a/xen/include/asm-ia64/domain.h	Fri Jun 03 01:15:33 2005 +0000
     5.2 +++ b/xen/include/asm-ia64/domain.h	Fri Jun 03 01:34:53 2005 +0000
     5.3 @@ -7,6 +7,7 @@
     5.4  #include <asm/vmmu.h>
     5.5  #include <asm/regionreg.h>
     5.6  #endif // CONFIG_VTI
     5.7 +#include <xen/list.h>
     5.8  
     5.9  extern void arch_do_createdomain(struct vcpu *);
    5.10  
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/xen/include/asm-ia64/slab.h	Fri Jun 03 01:34:53 2005 +0000
     6.3 @@ -0,0 +1,3 @@
     6.4 +#include <xen/xmalloc.h>
     6.5 +#include <linux/gfp.h>
     6.6 +#include <asm/delay.h>