1.1 --- a/xen/include/public/arch-ia64.h	Thu Jun 29 14:30:41 2006 +0100
     1.2 +++ b/xen/include/public/arch-ia64.h	Thu Jun 29 14:37:32 2006 +0100
     1.3 @@ -40,6 +40,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     1.4  
     1.5  #ifndef __ASSEMBLY__
     1.6  
     1.7 +typedef unsigned long xen_ulong_t;
     1.8 +
     1.9  #define MAX_NR_SECTION  32  /* at most 32 memory holes */
    1.10  struct mm_section {
    1.11      unsigned long start;  /* start of memory hole */

     2.1 --- a/xen/include/public/arch-x86_32.h	Thu Jun 29 14:30:41 2006 +0100
     2.2 +++ b/xen/include/public/arch-x86_32.h	Thu Jun 29 14:37:32 2006 +0100
     2.3 @@ -98,6 +98,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     2.4  
     2.5  #ifndef __ASSEMBLY__
     2.6  
     2.7 +typedef unsigned long xen_ulong_t;
     2.8 +
     2.9  /*
    2.10   * Send an array of these to HYPERVISOR_set_trap_table()
    2.11   */

     3.1 --- a/xen/include/public/arch-x86_64.h	Thu Jun 29 14:30:41 2006 +0100
     3.2 +++ b/xen/include/public/arch-x86_64.h	Thu Jun 29 14:37:32 2006 +0100
     3.3 @@ -105,6 +105,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
     3.4  
     3.5  #ifndef __ASSEMBLY__
     3.6  
     3.7 +typedef unsigned long xen_ulong_t;
     3.8 +
     3.9  /*
    3.10   * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
    3.11   *  @which == SEGBASE_*  ;  @base == 64-bit base address

     4.1 --- a/xen/include/public/memory.h	Thu Jun 29 14:30:41 2006 +0100
     4.2 +++ b/xen/include/public/memory.h	Thu Jun 29 14:37:32 2006 +0100
     4.3 @@ -32,7 +32,7 @@ struct xen_memory_reservation {
     4.4      XEN_GUEST_HANDLE(xen_pfn_t) extent_start;
     4.5  
     4.6      /* Number of extents, and size/alignment of each (2^extent_order pages). */
     4.7 -    unsigned long  nr_extents;
     4.8 +    xen_ulong_t    nr_extents;
     4.9      unsigned int   extent_order;
    4.10  
    4.11      /*
    4.12 @@ -90,7 +90,7 @@ struct xen_memory_exchange {
    4.13       *     command will be non-zero.
    4.14       *  5. THIS FIELD MUST BE INITIALISED TO ZERO BY THE CALLER!
    4.15       */
    4.16 -    unsigned long nr_exchanged;
    4.17 +    xen_ulong_t nr_exchanged;
    4.18  };
    4.19  typedef struct xen_memory_exchange xen_memory_exchange_t;
    4.20  DEFINE_XEN_GUEST_HANDLE(xen_memory_exchange_t);
    4.21 @@ -148,8 +148,8 @@ DEFINE_XEN_GUEST_HANDLE(xen_machphys_mfn
    4.22   */
    4.23  #define XENMEM_machphys_mapping     12
    4.24  struct xen_machphys_mapping {
    4.25 -    unsigned long v_start, v_end; /* Start and end virtual addresses.   */
    4.26 -    unsigned long max_mfn;        /* Maximum MFN that can be looked up. */
    4.27 +    xen_ulong_t v_start, v_end; /* Start and end virtual addresses.   */
    4.28 +    xen_ulong_t max_mfn;        /* Maximum MFN that can be looked up. */
    4.29  };
    4.30  typedef struct xen_machphys_mapping xen_machphys_mapping_t;
    4.31  DEFINE_XEN_GUEST_HANDLE(xen_machphys_mapping_t);
    4.32 @@ -170,7 +170,7 @@ struct xen_add_to_physmap {
    4.33      unsigned int space;
    4.34  
    4.35      /* Index into source mapping space. */
    4.36 -    unsigned long idx;
    4.37 +    xen_ulong_t idx;
    4.38  
    4.39      /* GPFN where the source mapping page should appear. */
    4.40      xen_pfn_t     gpfn;
    4.41 @@ -188,7 +188,7 @@ struct xen_translate_gpfn_list {
    4.42      domid_t domid;
    4.43  
    4.44      /* Length of list. */
    4.45 -    unsigned long nr_gpfns;
    4.46 +    xen_ulong_t nr_gpfns;
    4.47  
    4.48      /* List of GPFNs to translate. */
    4.49      XEN_GUEST_HANDLE(xen_pfn_t) gpfn_list;