1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Wed May 03 10:58:43 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre	Wed May 03 10:59:54 2006 +0100
     1.3 @@ -14,28 +14,12 @@ function try_to_mv() {
     1.4  	fi
     1.5  }
     1.6  
     1.7 -function try_to_mkdir() {
     1.8 -	if [ ! -e $2 ]
     1.9 -	then
    1.10 -		mv $1 $2
    1.11 -		mkdir $1
    1.12 -	fi
    1.13 -}
    1.14 -
    1.15 -try_to_mkdir mm mm.xen-x86
    1.16 -try_to_mv net net.xen-x86
    1.17 -try_to_mv kernel kernel.xen-x86
    1.18 -try_to_mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
    1.19 -#try_to_mv arch/xen/kernel drivers/xen/core
    1.20 -#try_to_mkdir arch/xen arch/xen.xen-x86
    1.21 -#try_to_mv arch/xen.xen-x86/configs arch/xen
    1.22 -#try_to_mv include/asm-generic include/asm-generic.xen-x86
    1.23 -try_to_mkdir include/linux include/linux.xen-x86
    1.24 +try_to_mv mm/Kconfig mm/Kconfig.xen-x86
    1.25  
    1.26  # need to grab a couple of xen-modified files for generic_page_range and
    1.27  # typedef pte_fn_t which are used by driver/xen blkif
    1.28 -ln -sf ../mm.xen-x86/memory.c mm/
    1.29 -ln -sf ../linux.xen-x86/mm.h include/linux/
    1.30 +#ln -sf ../mm.xen-x86/memory.c mm/
    1.31 +#ln -sf ../linux.xen-x86/mm.h include/linux/
    1.32  
    1.33  #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
    1.34  ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/

     2.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Wed May 03 10:58:43 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h	Wed May 03 10:59:54 2006 +0100
     2.3 @@ -134,7 +134,6 @@ HYPERVISOR_poll(
     2.4  #define	pte_mfn(_x)	pte_pfn(_x)
     2.5  #define __pte_ma(_x)	((pte_t) {(_x)})
     2.6  #define phys_to_machine_mapping_valid(_x)	(1)
     2.7 -#define	kmap_flush_unused()	do {} while (0)
     2.8  #define pfn_pte_ma(_x,_y)	__pte_ma(0)
     2.9  #ifndef CONFIG_XEN_IA64_DOM0_VP //XXX
    2.10  #define set_phys_to_machine(_x,_y)	do {} while (0)