Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / asm-mips / mmzone.h

diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h
index 29ee13b..7bde443 100644 (file)
--- a/include/asm-mips/mmzone.h
+++ b/include/asm-mips/mmzone.h
@@ -5,9 +5,12 @@
 #ifndef _ASM_MMZONE_H_
 #define _ASM_MMZONE_H_
 
+#include <linux/config.h>
 #include <asm/page.h>
 #include <mmzone.h>
 
+#ifdef CONFIG_DISCONTIGMEM
+
 #define kvaddr_to_nid(kvaddr)  pa_to_nid(__pa(kvaddr))
 #define pfn_to_nid(pfn)                pa_to_nid((pfn) << PAGE_SHIFT)
 
@@ -19,21 +22,9 @@
                       NODE_DATA(__n)->node_spanned_pages) : 0);\
 })
 
-#define pfn_to_page(pfn)                                       \
-({                                                             \
-       unsigned long __pfn = (pfn);                            \
-       pg_data_t *__pg = NODE_DATA(pfn_to_nid(__pfn));         \
-       __pg->node_mem_map + (__pfn - __pg->node_start_pfn);    \
-})
-
-#define page_to_pfn(p)                                         \
-({                                                             \
-       struct page *__p = (p);                                 \
-       struct zone *__z = page_zone(__p);                      \
-       ((__p - __z->zone_mem_map) + __z->zone_start_pfn);      \
-})
-
 /* XXX: FIXME -- wli */
 #define kern_addr_valid(addr)  (0)
 
+#endif /* CONFIG_DISCONTIGMEM */
+
 #endif /* _ASM_MMZONE_H_ */