Index: linux-2.6/include/asm-ia64/pgtable.h
===================================================================
--- linux-2.6.orig/include/asm-ia64/pgtable.h	2007-11-16 17:53:23.000000000 -0800
+++ linux-2.6/include/asm-ia64/pgtable.h	2007-11-16 17:53:26.000000000 -0800
@@ -244,18 +244,8 @@ ia64_phys_addr_valid (unsigned long addr
 
 #define VMALLOC_START		(RGN_BASE(RGN_GATE) + 0x200000000UL)
 #define VMALLOC_END_INIT	(RGN_BASE(RGN_GATE) + (1UL << (4*PAGE_SHIFT - 10)))
-
-#ifdef CONFIG_VIRTUAL_MEM_MAP
-# define VMALLOC_END		vmalloc_end
-  extern unsigned long vmalloc_end;
-#else
-# define VMALLOC_END VMALLOC_END_INIT
-#endif
-
-#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_SPARSEMEM_VMEMMAP)
-/* SPARSEMEM_VMEMMAP uses half of vmalloc... */
-# define vmemmap		((struct page *)VMALLOC_END_INIT)
-#endif
+#define VMALLOC_END		VMALLOC_END_INIT
+#define vmemmap			((struct page *)VMALLOC_END)
 
 #define CPU_AREA_BASE		(RGN_BASE(RGN_GATE) + (3UL << (4*PAGE_SHIFT - 11)))