1.1 --- a/xen/include/public/arch-ia64.h	Fri Jan 18 15:28:59 2008 +0000
     1.2 +++ b/xen/include/public/arch-ia64.h	Fri Jan 18 15:38:52 2008 +0000
     1.3 @@ -47,18 +47,7 @@
     1.4  #endif
     1.5  
     1.6  #ifndef __ASSEMBLY__
     1.7 -/* Guest handles for primitive C types. */
     1.8 -__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
     1.9 -__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
    1.10 -__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
    1.11 -__DEFINE_XEN_GUEST_HANDLE(u64,   unsigned long);
    1.12 -DEFINE_XEN_GUEST_HANDLE(char);
    1.13 -DEFINE_XEN_GUEST_HANDLE(int);
    1.14 -DEFINE_XEN_GUEST_HANDLE(long);
    1.15 -DEFINE_XEN_GUEST_HANDLE(void);
    1.16 -
    1.17  typedef unsigned long xen_pfn_t;
    1.18 -DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
    1.19  #define PRI_xen_pfn "lx"
    1.20  #endif
    1.21  

     2.1 --- a/xen/include/public/arch-powerpc.h	Fri Jan 18 15:28:59 2008 +0000
     2.2 +++ b/xen/include/public/arch-powerpc.h	Fri Jan 18 15:38:52 2008 +0000
     2.3 @@ -47,17 +47,7 @@
     2.4  #endif
     2.5  
     2.6  #ifndef __ASSEMBLY__
     2.7 -/* Guest handles for primitive C types. */
     2.8 -__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
     2.9 -__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
    2.10 -__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
    2.11 -DEFINE_XEN_GUEST_HANDLE(char);
    2.12 -DEFINE_XEN_GUEST_HANDLE(int);
    2.13 -DEFINE_XEN_GUEST_HANDLE(long);
    2.14 -DEFINE_XEN_GUEST_HANDLE(void);
    2.15 -
    2.16  typedef unsigned long long xen_pfn_t;
    2.17 -DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
    2.18  #define PRI_xen_pfn "llx"
    2.19  #endif
    2.20  

     3.1 --- a/xen/include/public/arch-x86/xen.h	Fri Jan 18 15:28:59 2008 +0000
     3.2 +++ b/xen/include/public/arch-x86/xen.h	Fri Jan 18 15:38:52 2008 +0000
     3.3 @@ -53,17 +53,7 @@
     3.4  #endif
     3.5  
     3.6  #ifndef __ASSEMBLY__
     3.7 -/* Guest handles for primitive C types. */
     3.8 -__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
     3.9 -__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
    3.10 -__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
    3.11 -DEFINE_XEN_GUEST_HANDLE(char);
    3.12 -DEFINE_XEN_GUEST_HANDLE(int);
    3.13 -DEFINE_XEN_GUEST_HANDLE(long);
    3.14 -DEFINE_XEN_GUEST_HANDLE(void);
    3.15 -
    3.16  typedef unsigned long xen_pfn_t;
    3.17 -DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
    3.18  #define PRI_xen_pfn "lx"
    3.19  #endif
    3.20  

     4.1 --- a/xen/include/public/xen.h	Fri Jan 18 15:28:59 2008 +0000
     4.2 +++ b/xen/include/public/xen.h	Fri Jan 18 15:38:52 2008 +0000
     4.3 @@ -39,6 +39,19 @@
     4.4  #error "Unsupported architecture"
     4.5  #endif
     4.6  
     4.7 +#ifndef __ASSEMBLY__
     4.8 +/* Guest handles for primitive C types. */
     4.9 +DEFINE_XEN_GUEST_HANDLE(char);
    4.10 +__DEFINE_XEN_GUEST_HANDLE(uchar, unsigned char);
    4.11 +DEFINE_XEN_GUEST_HANDLE(int);
    4.12 +__DEFINE_XEN_GUEST_HANDLE(uint,  unsigned int);
    4.13 +DEFINE_XEN_GUEST_HANDLE(long);
    4.14 +__DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
    4.15 +DEFINE_XEN_GUEST_HANDLE(void);
    4.16 +
    4.17 +DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
    4.18 +#endif
    4.19 +
    4.20  /*
    4.21   * HYPERCALLS
    4.22   */