1.1 --- a/xen/arch/ia64/xen/hypercall.c	Fri Jan 18 15:38:52 2008 +0000
     1.2 +++ b/xen/arch/ia64/xen/hypercall.c	Fri Jan 18 15:46:58 2008 +0000
     1.3 @@ -34,9 +34,6 @@
     1.4  #include <xen/perfc.h>
     1.5  #include <public/arch-ia64/debug_op.h>
     1.6  
     1.7 -extern long do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg);
     1.8 -extern long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg);
     1.9 -
    1.10  static IA64FAULT
    1.11  xen_hypercall (struct pt_regs *regs)
    1.12  {
    1.13 @@ -457,7 +454,7 @@ static long unregister_guest_callback(st
    1.14  /* First time to add callback to xen/ia64, so let's just stick to
    1.15   * the newer callback interface.
    1.16   */
    1.17 -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg)
    1.18 +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
    1.19  {
    1.20      long ret;
    1.21  

     2.1 --- a/xen/arch/x86/x86_32/traps.c	Fri Jan 18 15:38:52 2008 +0000
     2.2 +++ b/xen/arch/x86/x86_32/traps.c	Fri Jan 18 15:46:58 2008 +0000
     2.3 @@ -419,7 +419,7 @@ static long unregister_guest_callback(st
     2.4  }
     2.5  
     2.6  
     2.7 -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg)
     2.8 +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
     2.9  {
    2.10      long ret;
    2.11  

     3.1 --- a/xen/arch/x86/x86_64/traps.c	Fri Jan 18 15:38:52 2008 +0000
     3.2 +++ b/xen/arch/x86/x86_64/traps.c	Fri Jan 18 15:46:58 2008 +0000
     3.3 @@ -470,7 +470,7 @@ static long unregister_guest_callback(st
     3.4  }
     3.5  
     3.6  
     3.7 -long do_callback_op(int cmd, XEN_GUEST_HANDLE(void) arg)
     3.8 +long do_callback_op(int cmd, XEN_GUEST_HANDLE(cvoid) arg)
     3.9  {
    3.10      long ret;
    3.11  

     4.1 --- a/xen/include/public/xen.h	Fri Jan 18 15:38:52 2008 +0000
     4.2 +++ b/xen/include/public/xen.h	Fri Jan 18 15:46:58 2008 +0000
     4.3 @@ -48,6 +48,7 @@ DEFINE_XEN_GUEST_HANDLE(int);
     4.4  DEFINE_XEN_GUEST_HANDLE(long);
     4.5  __DEFINE_XEN_GUEST_HANDLE(ulong, unsigned long);
     4.6  DEFINE_XEN_GUEST_HANDLE(void);
     4.7 +__DEFINE_XEN_GUEST_HANDLE(cvoid, const void);
     4.8  
     4.9  DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
    4.10  #endif