Index: linux-2.6/include/asm-x86_64/pgtable.h
===================================================================
--- linux-2.6.orig/include/asm-x86_64/pgtable.h	2007-03-17 20:34:32.000000000 -0700
+++ linux-2.6/include/asm-x86_64/pgtable.h	2007-03-17 20:34:51.000000000 -0700
@@ -130,13 +130,8 @@
 
 #ifndef __ASSEMBLY__
 #define MAXMEM		 0x3fffffffffffUL
-#define __PAGE_OFFSET    0xffff810000000000UL	/* 65 TB 1-1 kernel data segment */
-#define VMALLOC_START    0xffffc20000000000UL	/* 32 TB vmalloc area */
-#define VMALLOC_END      0xffffe1ffffffffffUL
 #define VMEMMAP_START	 0xffffe20000000000UL	/* 16 TB vmemmap space for */
 #define VMEMMAP_END	 0xfffff20000000000UL	/* up to 1 PB of phys mem */
-#define KERNEL_TEXT_START
-			 0xffffffff80000000UL	/* 128 MB kernel text */
 #define MODULES_VADDR    0xffffffff88000000UL	/* 127 MB modules space */
 #define MODULES_END      0xfffffffffff00000UL
 #define MODULES_LEN   (MODULES_END - MODULES_VADDR)