[PATCH] remove non-DISCONTIG use of pgdat->node_mem_map

[linux-2.6-omap-h63xx.git] / include / asm-alpha / mmzone.h

diff --git a/include/asm-alpha/mmzone.h b/include/asm-alpha/mmzone.h
index 726c150dcbe490476a31e49d71208a31d7c82933..a011ef4cf3d3f4ee5ee16c320cc3bbed622e3b7f 100644 (file)
--- a/include/asm-alpha/mmzone.h
+++ b/include/asm-alpha/mmzone.h
@@ -57,7 +57,6 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
  * Given a kernel address, find the home node of the underlying memory.
  */
 #define kvaddr_to_nid(kaddr)   pa_to_nid(__pa(kaddr))
-#define node_mem_map(nid)      (NODE_DATA(nid)->node_mem_map)
 #define node_start_pfn(nid)    (NODE_DATA(nid)->node_start_pfn)
 
 #define local_mapnr(kvaddr) \
@@ -108,7 +107,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n)
 #define pfn_to_page(pfn)                                               \
 ({                                                                     \
        unsigned long kaddr = (unsigned long)__va((pfn) << PAGE_SHIFT); \
-       (node_mem_map(kvaddr_to_nid(kaddr)) + local_mapnr(kaddr));      \
+       (NODE_DATA(kvaddr_to_nid(kaddr))->node_mem_map + local_mapnr(kaddr));   \
 })
 
 #define page_to_pfn(page)                                              \