Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 0 insertions, 11 deletions

diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h
index 7bde4432092b..f6bd2e0c45a1 100644
--- a/include/asm-mips/mmzone.h
+++ b/include/asm-mips/mmzone.h
@@ -14,17 +14,6 @@
 #define kvaddr_to_nid(kvaddr)   pa_to_nid(__pa(kvaddr))
 #define pfn_to_nid(pfn)         pa_to_nid((pfn) << PAGE_SHIFT)
 
-#define pfn_valid(pfn)                                          \
-({                                                              \
-        unsigned long __pfn = (pfn);                            \
-        int __n = pfn_to_nid(__pfn);                            \
-        ((__n >= 0) ? (__pfn < NODE_DATA(__n)->node_start_pfn + \
-                       NODE_DATA(__n)->node_spanned_pages) : 0);\
-})
-
-/* XXX: FIXME -- wli */
-#define kern_addr_valid(addr)   (0)
-
 #endif /* CONFIG_DISCONTIGMEM */
 
 #endif /* _ASM_MMZONE_H_ */