---
 arch/x86/mm/ioremap_64.c  |   17 -----------------
 include/asm-x86/page_64.h |    3 ---
 2 files changed, 20 deletions(-)

Index: linux-2.6/arch/x86/mm/ioremap_64.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/ioremap_64.c	2007-11-12 18:13:11.395593745 -0800
+++ linux-2.6/arch/x86/mm/ioremap_64.c	2007-11-12 18:13:22.212573586 -0800
@@ -86,23 +86,6 @@ void __iomem * __ioremap(unsigned long p
 	if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
 		return (__force void __iomem *)phys_to_virt(phys_addr);
 
-#ifdef CONFIG_FLATMEM
-	/*
-	 * Don't allow anybody to remap normal RAM that we're using..
-	 */
-	if (last_addr < virt_to_phys(high_memory)) {
-		char *t_addr, *t_end;
- 		struct page *page;
-
-		t_addr = __va(phys_addr);
-		t_end = t_addr + (size - 1);
-	   
-		for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
-			if(!PageReserved(page))
-				return NULL;
-	}
-#endif
-
 	pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_GLOBAL
 			  | _PAGE_DIRTY | _PAGE_ACCESSED | flags);
 	/*
Index: linux-2.6/include/asm-x86/page_64.h
===================================================================
--- linux-2.6.orig/include/asm-x86/page_64.h	2007-11-12 18:12:33.819593976 -0800
+++ linux-2.6/include/asm-x86/page_64.h	2007-11-12 18:12:46.107593763 -0800
@@ -121,9 +121,6 @@ extern unsigned long __phys_addr(unsigne
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define __boot_va(x)		__va(x)
 #define __boot_pa(x)		__pa(x)
-#ifdef CONFIG_FLATMEM
-#define pfn_valid(pfn)		((pfn) < end_pfn)
-#endif
 
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)