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

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

diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 13830ae67caca65fc5250ce7d425689ad6bde0dd..9cec191f462c2ae0ed1175aec4b25f34d991c7dc 100644 (file)
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -79,7 +79,6 @@ static inline int pfn_to_nid(unsigned long pfn)
  */
 #define kvaddr_to_nid(kaddr)   pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT)
 
-#define node_mem_map(nid)      (NODE_DATA(nid)->node_mem_map)
 #define node_start_pfn(nid)    (NODE_DATA(nid)->node_start_pfn)
 #define node_end_pfn(nid)                                              \
 ({                                                                     \
@@ -100,7 +99,7 @@ static inline int pfn_to_nid(unsigned long pfn)
 ({                                                                     \
        unsigned long __pfn = pfn;                                      \
        int __node  = pfn_to_nid(__pfn);                                \
-       &node_mem_map(__node)[node_localnr(__pfn,__node)];              \
+       &NODE_DATA(__node)->node_mem_map[node_localnr(__pfn,__node)];   \
 })
 
 #define page_to_pfn(pg)                                                        \