diff options
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/mmzone.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86_64/mmzone.h index d95b7c24083..ca4fc3fe0de 100644 --- a/include/asm-x86_64/mmzone.h +++ b/include/asm-x86_64/mmzone.h | |||
@@ -35,9 +35,6 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) | |||
35 | #define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) | 35 | #define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) |
36 | #define NODE_DATA(nid) (node_data[nid]) | 36 | #define NODE_DATA(nid) (node_data[nid]) |
37 | 37 | ||
38 | #define node_mem_map(nid) (NODE_DATA(nid)->node_mem_map) | ||
39 | |||
40 | #define node_mem_map(nid) (NODE_DATA(nid)->node_mem_map) | ||
41 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) | 38 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) |
42 | #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ | 39 | #define node_end_pfn(nid) (NODE_DATA(nid)->node_start_pfn + \ |
43 | NODE_DATA(nid)->node_spanned_pages) | 40 | NODE_DATA(nid)->node_spanned_pages) |
@@ -50,7 +47,7 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) | |||
50 | (2.4 used to). */ | 47 | (2.4 used to). */ |
51 | #define pfn_to_page(pfn) ({ \ | 48 | #define pfn_to_page(pfn) ({ \ |
52 | int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); \ | 49 | int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); \ |
53 | ((pfn) - node_start_pfn(nid)) + node_mem_map(nid); \ | 50 | ((pfn) - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map; \ |
54 | }) | 51 | }) |
55 | 52 | ||
56 | #define page_to_pfn(page) \ | 53 | #define page_to_pfn(page) \ |