Index: xen-unstable.hg/xen/include/asm-ia64/linux-xen/linux/efi.h
===================================================================
--- xen-unstable.hg.orig/xen/include/asm-ia64/linux-xen/linux/efi.h	2007-12-18 13:53:01.000000000 +0900
+++ xen-unstable.hg/xen/include/asm-ia64/linux-xen/linux/efi.h	2007-12-18 13:53:46.000000000 +0900
@@ -421,7 +421,8 @@ struct efi_generic_dev_path {
 	u16 length;
 } __attribute ((packed));
 
-#ifdef XEN
+#define XEN_EFI_RID_SWITCH 0
+#if XEN_EFI_RID_SWITCH
 /*
  * According to xen/arch/ia64/xen/regionreg.c the RID space is broken
  * up into chunks, one per domain, and 0th block is for Xen. The 0th block