Pull bugzilla-5764 into release branch

[linux-2.6-omap-h63xx.git] / include / asm-mips / page.h

diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h
index a1eab136ff6c7963a6dc2dde3b996db13e70bcda..4035ec79ecd494415bceccdc32f91d31e388aee6 100644 (file)
--- a/include/asm-mips/page.h
+++ b/include/asm-mips/page.h
@@ -139,9 +139,11 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
 
+#ifndef CONFIG_SPARSEMEM
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 #define pfn_valid(pfn)         ((pfn) < max_mapnr)
 #endif
+#endif
 
 #define virt_to_page(kaddr)    pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)