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-11 13:15:48.000000000 +0900
+++ xen-unstable.hg/xen/include/asm-ia64/linux-xen/linux/efi.h	2007-12-11 14:28:07.000000000 +0900
@@ -487,13 +487,11 @@ struct efi_generic_dev_path {
 	rr6 = ia64_get_rr(6UL << 61);			\
 	rr7 = ia64_get_rr(7UL << 61);			\
 	ia64_set_rr(6UL << 61, XEN_EFI_RID);		\
-	ia64_set_rr(7UL << 61, XEN_EFI_RID);		\
 	ia64_srlz_d();					\
 } while (0)
 
 #define XEN_EFI_RR_RESTORE(rr6, rr7) do {		\
 	ia64_set_rr(6UL << 61, rr6);			\
-	ia64_set_rr(7UL << 61, rr7);			\
 	ia64_srlz_d();					\
 } while (0)