# HG changeset patch
# User gingold@virtu10
# Node ID 869cc1f44e52d9578dc9fe3658437127d1116081
# Parent  780e422b936818fbc91a458f1e7632d2ded48332
Do not export XSI_BASE.

OS now have to explicitly set the xsi base.

Signed-off-by: Tristan Gingold <tristan.gingold@xxxxxxxx>

diff -r 780e422b9368 -r 869cc1f44e52 linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S	Thu Sep 28 11:06:30 2006 +0200
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S	Thu Sep 28 12:47:49 2006 +0200
@@ -23,12 +23,11 @@ GLOBAL_ENTRY(early_xen_setup)
 	
 	mov cr.iva=r10
 
-#if XSI_BASE != 0xf100000000000000UL
-	/* Backward compatibility.  */
-(isBP)	mov r2=0x600
+	/* Set xsi base.  */
+#define FW_HYPERCALL_SET_SHARED_INFO_VA			0x600
+(isBP)	mov r2=FW_HYPERCALL_SET_SHARED_INFO_VA
 (isBP)	movl r28=XSI_BASE;;
 (isBP)	break 0x1000;;
-#endif
 
 	br.ret.sptk.many rp
 	;;
diff -r 780e422b9368 -r 869cc1f44e52 linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h	Thu Sep 28 11:06:30 2006 +0200
+++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h	Thu Sep 28 12:47:49 2006 +0200
@@ -14,12 +14,9 @@
 
 #define IA64_PARAVIRTUALIZED
 
-#if 0
-#undef XSI_BASE
 /* At 1 MB, before per-cpu space but still addressable using addl instead
    of movl. */
 #define XSI_BASE				0xfffffffffff00000
-#endif
 
 /* Address of mapped regs.  */
 #define XMAPPEDREGS_BASE		(XSI_BASE + XSI_SIZE)
diff -r 780e422b9368 -r 869cc1f44e52 xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h	Thu Sep 28 11:06:30 2006 +0200
+++ b/xen/include/public/arch-ia64.h	Thu Sep 28 12:47:49 2006 +0200
@@ -392,10 +392,6 @@ struct xen_ia64_boot_param {
 
 #endif /* !__ASSEMBLY__ */
 
-/* Address of shared_info in domain virtual space.
-   This is the default address, for compatibility only.  */
-#define XSI_BASE			0xf100000000000000
-
 /* Size of the shared_info area (this is not related to page size).  */
 #define XSI_SHIFT			14
 #define XSI_SIZE			(1 << XSI_SHIFT)