Index: xen-unstable.hg/xen/include/asm-ia64/vhpt.h
===================================================================
--- xen-unstable.hg.orig/xen/include/asm-ia64/vhpt.h	2007-12-18 15:04:30.000000000 +0900
+++ xen-unstable.hg/xen/include/asm-ia64/vhpt.h	2007-12-18 15:58:54.000000000 +0900
@@ -1,7 +1,7 @@
 #ifndef ASM_VHPT_H
 #define ASM_VHPT_H
 
-#define VHPT_ENABLED 1
+#define VHPT_ENABLED 0
 
 /* Size of the VHPT.  */
 // XXX work around to avoid trigerring xenLinux software lock up detection.
Index: xen-unstable.hg/xen/arch/ia64/linux-xen/head.S
===================================================================
--- xen-unstable.hg.orig/xen/arch/ia64/linux-xen/head.S	2007-12-18 16:11:32.000000000 +0900
+++ xen-unstable.hg/xen/arch/ia64/linux-xen/head.S	2007-12-18 16:11:49.000000000 +0900
@@ -32,6 +32,9 @@
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/mca_asm.h>
+#if XEN
+#include <asm/vhpt.h>
+#endif
 
 #ifdef CONFIG_HOTPLUG_CPU
 #define SAL_PSR_BITS_TO_SET				\
@@ -232,12 +235,12 @@ start_ap:
 	 * We initialize all of them to prevent inadvertently assuming
 	 * something about the state of address translation early in boot.
 	 */
-	SET_ONE_RR(0, PAGE_SHIFT, r2, r16, 1);;
-	SET_ONE_RR(1, PAGE_SHIFT, r2, r16, 1);;
-	SET_ONE_RR(2, PAGE_SHIFT, r2, r16, 1);;
-	SET_ONE_RR(3, PAGE_SHIFT, r2, r16, 1);;
-	SET_ONE_RR(4, PAGE_SHIFT, r2, r16, 1);;
-	SET_ONE_RR(5, PAGE_SHIFT, r2, r16, 1);;
+	SET_ONE_RR(0, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
+	SET_ONE_RR(1, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
+	SET_ONE_RR(2, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
+	SET_ONE_RR(3, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
+	SET_ONE_RR(4, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
+	SET_ONE_RR(5, PAGE_SHIFT, r2, r16, VHPT_ENABLED);;
 	SET_ONE_RR(6, IA64_GRANULE_SHIFT, r2, r16, 0);;
 	SET_ONE_RR(7, IA64_GRANULE_SHIFT, r2, r16, 0);;
 	/*