diff options
| -rw-r--r-- | include/asm-x86_64/mmzone.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86_64/mmzone.h index b40c661f111e..8d48dc7e43a7 100644 --- a/include/asm-x86_64/mmzone.h +++ b/include/asm-x86_64/mmzone.h | |||
| @@ -41,9 +41,7 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) | |||
| 41 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) | 41 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) |
| 42 | #define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) | 42 | #define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) |
| 43 | 43 | ||
| 44 | /* AK: this currently doesn't deal with invalid addresses. We'll see | 44 | /* Requires pfn_valid(pfn) to be true */ |
| 45 | if the 2.5 kernel doesn't pass them | ||
| 46 | (2.4 used to). */ | ||
| 47 | #define pfn_to_page(pfn) ({ \ | 45 | #define pfn_to_page(pfn) ({ \ |
| 48 | int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); \ | 46 | int nid = phys_to_nid(((unsigned long)(pfn)) << PAGE_SHIFT); \ |
| 49 | ((pfn) - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map; \ | 47 | ((pfn) - node_start_pfn(nid)) + NODE_DATA(nid)->node_mem_map; \ |