1.1 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Fri Jan 26 13:31:59 2007 +0000
     1.2 +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Fri Jan 26 13:34:02 2007 +0000
     1.3 @@ -76,8 +76,12 @@ extern char *kasprintf(gfp_t gfp, const 
     1.4         __attribute__ ((format (printf, 2, 3)));
     1.5  #endif
     1.6  
     1.7 -#if defined(_I386_PAGE_H) && defined(CONFIG_X86_PAE)
     1.8 -#define __supported_pte_mask ~0ULL
     1.9 -#endif
    1.10 +/*
    1.11 + * This variable at present is referenced by netfront, but only in code that
    1.12 + * is dead when running in hvm guests. To detect potential active uses of it
    1.13 + * in the future, don't try to supply a 'valid' value here, so that any
    1.14 + * mappings created with it will fault when accessed.
    1.15 + */
    1.16 +#define __supported_pte_mask ((maddr_t)0)
    1.17  
    1.18  #endif

     2.1 --- a/unmodified_drivers/linux-2.6/mkbuildtree	Fri Jan 26 13:31:59 2007 +0000
     2.2 +++ b/unmodified_drivers/linux-2.6/mkbuildtree	Fri Jan 26 13:34:02 2007 +0000
     2.3 @@ -24,11 +24,7 @@ ln -sf ${XL}/drivers/xen/core/features.c
     2.4  ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus
     2.5  ln -sf ${XL}/drivers/xen/core/reboot.c util
     2.6  
     2.7 -mkdir -p include
     2.8 -mkdir -p include/xen
     2.9 -mkdir -p include/public
    2.10 -mkdir -p include/asm
    2.11 -mkdir -p include/asm/xen
    2.12 +mkdir -p include/asm include/xen
    2.13  
    2.14  lndir -silent ${XL}/include/xen include/xen
    2.15  ln -nsf ${XEN}/include/public include/xen/interface
    2.16 @@ -43,7 +39,8 @@ in
    2.17      ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/hypercall.h include/asm
    2.18      ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/synch_bitops.h include/asm
    2.19      ln -sf ${XL}/include/asm-x86_64/mach-xen/asm/maddr.h include/asm
    2.20 -    ln -sf ${XL}/include/asm-i386 include/asm-i386
    2.21 +    mkdir include/asm-i386
    2.22 +    lndir -silent ${XL}/include/asm-i386 include/asm-i386
    2.23    ;;
    2.24  i[34567]86)
    2.25      ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
    2.26 @@ -56,6 +53,7 @@ i[34567]86)
    2.27      ln -sf ${XL}/include/asm-ia64/hypercall.h include/asm
    2.28      ln -sf ${XL}/include/asm-ia64/synch_bitops.h include/asm
    2.29      ln -sf ${XL}/include/asm-ia64/maddr.h include/asm
    2.30 +    mkdir include/asm/xen
    2.31      ln -sf ${XL}/include/asm-ia64/xen/xcom_hcall.h include/asm/xen
    2.32      ln -sf ${XL}/include/asm-ia64/xen/xencomm.h include/asm/xen
    2.33      ln -sf ${XL}/arch/ia64/xen/xcom_mini.c platform-pci

     3.1 --- a/unmodified_drivers/linux-2.6/overrides.mk	Fri Jan 26 13:31:59 2007 +0000
     3.2 +++ b/unmodified_drivers/linux-2.6/overrides.mk	Fri Jan 26 13:34:02 2007 +0000
     3.3 @@ -4,9 +4,5 @@
     3.4  #
     3.5  # (i.e. we need the native config for things like -mregparm, but
     3.6  # a Xen kernel to find the right headers)
     3.7 -EXTRA_CFLAGS += -DCONFIG_VMX -DCONFIG_VMX_GUEST -DCONFIG_X86_XEN
     3.8 -EXTRA_CFLAGS += -DCONFIG_XEN_SHADOW_MODE -DCONFIG_XEN_SHADOW_TRANSLATE
     3.9 -EXTRA_CFLAGS += -DCONFIG_XEN_BLKDEV_GRANT -DXEN_EVTCHN_MASK_OPS
    3.10 -EXTRA_CFLAGS += -DCONFIG_XEN_NETDEV_GRANT_RX -DCONFIG_XEN_NETDEV_GRANT_TX
    3.11  EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030202
    3.12  EXTRA_CFLAGS += -I$(M)/include -I$(M)/compat-include -DHAVE_XEN_PLATFORM_COMPAT_H