1.1 --- a/xen/arch/ia64/xen/xensetup.c	Sun Feb 04 11:41:25 2007 -0700
     1.2 +++ b/xen/arch/ia64/xen/xensetup.c	Sun Feb 04 12:06:59 2007 -0700
     1.3 @@ -27,6 +27,7 @@
     1.4  #include <linux/efi.h>
     1.5  #include <asm/iosapic.h>
     1.6  #include <xen/softirq.h>
     1.7 +#include <xen/rcupdate.h>
     1.8  
     1.9  unsigned long xenheap_phys_end, total_pages;
    1.10  

     2.1 --- a/xen/include/asm-ia64/linux-xen/linux/efi.h	Sun Feb 04 11:41:25 2007 -0700
     2.2 +++ b/xen/include/asm-ia64/linux-xen/linux/efi.h	Sun Feb 04 12:06:59 2007 -0700
     2.3 @@ -280,7 +280,11 @@ efi_guidcmp (efi_guid_t left, efi_guid_t
     2.4  static inline char *
     2.5  efi_guid_unparse(efi_guid_t *guid, char *out)
     2.6  {
     2.7 +#ifndef XEN
     2.8  	sprintf(out, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
     2.9 +#else
    2.10 +	snprintf(out, 37, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
    2.11 +#endif
    2.12  		guid->b[3], guid->b[2], guid->b[1], guid->b[0],
    2.13  		guid->b[5], guid->b[4], guid->b[7], guid->b[6],
    2.14  		guid->b[8], guid->b[9], guid->b[10], guid->b[11],