1.1 --- a/extras/mini-os/include/hypervisor.h	Mon Sep 12 12:17:31 2005 +0000
     1.2 +++ b/extras/mini-os/include/hypervisor.h	Mon Sep 12 12:29:40 2005 +0000
     1.3 @@ -414,15 +414,15 @@ HYPERVISOR_event_channel_op(
     1.4  
     1.5  static inline int
     1.6  HYPERVISOR_xen_version(
     1.7 -    int cmd)
     1.8 +    int cmd, void *arg)
     1.9  {
    1.10      int ret;
    1.11 -    unsigned long ignore;
    1.12 +    unsigned long ignore, ign2;
    1.13  
    1.14      __asm__ __volatile__ (
    1.15          TRAP_INSTR
    1.16 -        : "=a" (ret), "=b" (ignore)
    1.17 -	: "0" (__HYPERVISOR_xen_version), "1" (cmd)
    1.18 +        : "=a" (ret), "=b" (ignore), "=c" (ign2)
    1.19 +	: "0" (__HYPERVISOR_xen_version), "1" (cmd), "2" (arg)
    1.20  	: "memory" );
    1.21  
    1.22      return ret;

     2.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Mon Sep 12 12:17:31 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c	Mon Sep 12 12:29:40 2005 +0000
     2.3 @@ -123,7 +123,7 @@ extern asmlinkage unsigned int do_IRQ(st
     2.4   */
     2.5  void force_evtchn_callback(void)
     2.6  {
     2.7 -    (void)HYPERVISOR_xen_version(0);
     2.8 +    (void)HYPERVISOR_xen_version(0, NULL);
     2.9  }
    2.10  EXPORT_SYMBOL(force_evtchn_callback);
    2.11  

     3.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h	Mon Sep 12 12:17:31 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h	Mon Sep 12 12:29:40 2005 +0000
     3.3 @@ -270,9 +270,9 @@ HYPERVISOR_event_channel_op(
     3.4  
     3.5  static inline int
     3.6  HYPERVISOR_xen_version(
     3.7 -	int cmd)
     3.8 +	int cmd, void *arg)
     3.9  {
    3.10 -	return _hypercall1(int, xen_version, cmd);
    3.11 +	return _hypercall2(int, xen_version, cmd, arg);
    3.12  }
    3.13  
    3.14  static inline int

     4.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h	Mon Sep 12 12:17:31 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/hypercall.h	Mon Sep 12 12:29:40 2005 +0000
     4.3 @@ -260,9 +260,9 @@ HYPERVISOR_event_channel_op(
     4.4  
     4.5  static inline int
     4.6  HYPERVISOR_xen_version(
     4.7 -	int cmd)
     4.8 +	int cmd, void *arg)
     4.9  {
    4.10 -	return _hypercall1(int, xen_version, cmd);
    4.11 +	return _hypercall2(int, xen_version, cmd, arg);
    4.12  }
    4.13  
    4.14  static inline int

     5.1 --- a/xen/arch/x86/x86_32/entry.S	Mon Sep 12 12:17:31 2005 +0000
     5.2 +++ b/xen/arch/x86/x86_32/entry.S	Mon Sep 12 12:29:40 2005 +0000
     5.3 @@ -834,7 +834,7 @@ ENTRY(hypercall_args_table)
     5.4          .byte 4 /* do_update_va_mapping */
     5.5          .byte 2 /* do_set_timer_op      */  /* 15 */
     5.6          .byte 1 /* do_event_channel_op  */
     5.7 -        .byte 1 /* do_xen_version       */
     5.8 +        .byte 2 /* do_xen_version       */
     5.9          .byte 3 /* do_console_io        */
    5.10          .byte 1 /* do_physdev_op        */
    5.11          .byte 3 /* do_grant_table_op    */  /* 20 */

     6.1 --- a/xen/arch/x86/x86_64/entry.S	Mon Sep 12 12:17:31 2005 +0000
     6.2 +++ b/xen/arch/x86/x86_64/entry.S	Mon Sep 12 12:29:40 2005 +0000
     6.3 @@ -655,7 +655,7 @@ ENTRY(hypercall_args_table)
     6.4          .byte 3 /* do_update_va_mapping */
     6.5          .byte 1 /* do_set_timer_op      */  /* 15 */
     6.6          .byte 1 /* do_event_channel_op  */
     6.7 -        .byte 1 /* do_xen_version       */
     6.8 +        .byte 2 /* do_xen_version       */
     6.9          .byte 3 /* do_console_io        */
    6.10          .byte 1 /* do_physdev_op        */
    6.11          .byte 3 /* do_grant_table_op    */  /* 20 */