# HG changeset patch
# User tristan.gingold@xxxxxxxx
# Node ID 62e50f3942deca1ec2a8870c909eb94081e08d01
# Parent  b922b25d6d37a124a70d71578af858022df57da4
zero_page_memmap_ptr removed (was unused).

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

diff -r b922b25d6d37 -r 62e50f3942de xen/arch/ia64/xen/mm_init.c
--- a/xen/arch/ia64/xen/mm_init.c	Fri Mar 17 08:20:14 2006
+++ b/xen/arch/ia64/xen/mm_init.c	Fri Mar 17 08:27:45 2006
@@ -66,8 +66,10 @@
 
 // static int pgt_cache_water[2] = { 25, 50 };
 
+#ifndef XEN
 struct page_info *zero_page_memmap_ptr;	/* map entry for zero page */
 EXPORT_SYMBOL(zero_page_memmap_ptr);
+#endif
 
 #ifdef XEN
 void *high_memory;
diff -r b922b25d6d37 -r 62e50f3942de xen/arch/ia64/xen/xenmem.c
--- a/xen/arch/ia64/xen/xenmem.c	Fri Mar 17 08:20:14 2006
+++ b/xen/arch/ia64/xen/xenmem.c	Fri Mar 17 08:27:45 2006
@@ -13,7 +13,6 @@
 #include <asm/pgtable.h>
 #include <xen/mm.h>
 
-extern struct page_info *zero_page_memmap_ptr;
 struct page_info *frame_table;
 unsigned long frame_table_size;
 unsigned long max_page;
@@ -52,9 +51,6 @@
 	for (i = 0; i < (1UL << mpt_order); i++) {
 		mpt_table[i] = INVALID_M2P_ENTRY;
 	}
-	/* Other mapping setup */
-
-	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
 }
 
 /* FIXME: postpone support to machines with big holes between physical memorys.
diff -r b922b25d6d37 -r 62e50f3942de xen/include/asm-ia64/linux-xen/asm/pgtable.h
--- a/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Fri Mar 17 08:20:14 2006
+++ b/xen/include/asm-ia64/linux-xen/asm/pgtable.h	Fri Mar 17 08:27:45 2006
@@ -467,8 +467,10 @@
  * for zero-mapped memory areas etc..
  */
 extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
+#ifndef XEN
 extern struct page *zero_page_memmap_ptr;
 #define ZERO_PAGE(vaddr) (zero_page_memmap_ptr)
+#endif
 
 /* We provide our own get_unmapped_area to cope with VA holes for userland */
 #define HAVE_ARCH_UNMAPPED_AREA