1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Sep 14 15:26:35 2005 -0600
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h	Wed Sep 14 15:33:52 2005 -0600
     1.3 @@ -47,6 +47,7 @@
     1.4  #include <linux/devfs_fs_kernel.h>
     1.5  #include <asm-xen/hypervisor.h>
     1.6  #include <asm-xen/xenbus.h>
     1.7 +#include <asm-xen/gnttab.h>
     1.8  #include <asm-xen/xen-public/xen.h>
     1.9  #include <asm-xen/xen-public/io/blkif.h>
    1.10  #include <asm-xen/xen-public/io/ring.h>

     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Sep 14 15:26:35 2005 -0600
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Sep 14 15:33:52 2005 -0600
     2.3 @@ -49,6 +49,7 @@
     2.4  #include <asm/io.h>
     2.5  #include <asm/irq.h>
     2.6  #include <asm/uaccess.h>
     2.7 +#include <asm-xen/xen-public/xen.h>
     2.8  #include <asm-xen/xen-public/event_channel.h>
     2.9  #include <asm-xen/hypervisor.h>
    2.10  #include <asm-xen/evtchn.h>

     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed Sep 14 15:26:35 2005 -0600
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c	Wed Sep 14 15:33:52 2005 -0600
     3.3 @@ -26,6 +26,8 @@
     3.4  #include <asm/uaccess.h>
     3.5  #include <asm/tlb.h>
     3.6  #include <asm-xen/linux-public/privcmd.h>
     3.7 +#include <asm-xen/linux-public/hypervisor.h>
     3.8 +#include <asm-xen/xen-public/xen.h>
     3.9  #include <asm-xen/xen-public/dom0_ops.h>
    3.10  #include <asm-xen/xen_proc.h>
    3.11  
    3.12 @@ -76,6 +78,18 @@ static int privcmd_ioctl(struct inode *i
    3.13                  "g" ((unsigned long)hypercall.arg[4])
    3.14                  : "r11","rcx","r8","r10","memory");
    3.15          }
    3.16 +#elif defined (__ia64__)
    3.17 +       __asm__ __volatile__ (
    3.18 +           ";; mov r14=%2; mov r15=%3; mov r16=%4; mov r17=%5; mov r18=%6; mov
    3.19 +r2=%1; break 0x1000;; mov %0=r8 ;;"
    3.20 +           : "=r" (ret)
    3.21 +           : "r" (hypercall.op),
    3.22 +             "r" (hypercall.arg[0]),
    3.23 +             "r" (hypercall.arg[1]),
    3.24 +             "r" (hypercall.arg[2]),
    3.25 +             "r" (hypercall.arg[3]),
    3.26 +             "r" (hypercall.arg[4])
    3.27 +           : "r14","r15","r16","r17","r18","r2","r8","memory");
    3.28  #endif
    3.29      }
    3.30      break;

     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Wed Sep 14 15:26:35 2005 -0600
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c	Wed Sep 14 15:33:52 2005 -0600
     4.3 @@ -40,6 +40,7 @@
     4.4  #include "xenbus_comms.h"
     4.5  
     4.6  #include <asm/uaccess.h>
     4.7 +#include <asm/hypervisor.h>
     4.8  #include <asm-xen/xenbus.h>
     4.9  #include <asm-xen/xen_proc.h>
    4.10  #include <asm-xen/linux-public/xenstored.h>