diff options
-rw-r--r-- | include/asm-mips/mmzone.h | 1 | ||||
-rw-r--r-- | include/asm-parisc/mmzone.h | 5 | ||||
-rw-r--r-- | include/asm-x86_64/mmzone.h | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-mips/mmzone.h b/include/asm-mips/mmzone.h index dc231c89bef9..f53ec54c92ff 100644 --- a/include/asm-mips/mmzone.h +++ b/include/asm-mips/mmzone.h | |||
@@ -10,7 +10,6 @@ | |||
10 | 10 | ||
11 | #ifdef CONFIG_DISCONTIGMEM | 11 | #ifdef CONFIG_DISCONTIGMEM |
12 | 12 | ||
13 | #define kvaddr_to_nid(kvaddr) pa_to_nid(__pa(kvaddr)) | ||
14 | #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) | 13 | #define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) |
15 | 14 | ||
16 | #endif /* CONFIG_DISCONTIGMEM */ | 15 | #endif /* CONFIG_DISCONTIGMEM */ |
diff --git a/include/asm-parisc/mmzone.h b/include/asm-parisc/mmzone.h index ceb9b73199d1..c87813662d4d 100644 --- a/include/asm-parisc/mmzone.h +++ b/include/asm-parisc/mmzone.h | |||
@@ -14,11 +14,6 @@ extern struct node_map_data node_data[]; | |||
14 | 14 | ||
15 | #define NODE_DATA(nid) (&node_data[nid].pg_data) | 15 | #define NODE_DATA(nid) (&node_data[nid].pg_data) |
16 | 16 | ||
17 | /* | ||
18 | * Given a kernel address, find the home node of the underlying memory. | ||
19 | */ | ||
20 | #define kvaddr_to_nid(kaddr) pfn_to_nid(__pa(kaddr) >> PAGE_SHIFT) | ||
21 | |||
22 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) | 17 | #define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) |
23 | #define node_end_pfn(nid) \ | 18 | #define node_end_pfn(nid) \ |
24 | ({ \ | 19 | ({ \ |
diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86_64/mmzone.h index 70bb9969766e..c38ebdf6f426 100644 --- a/include/asm-x86_64/mmzone.h +++ b/include/asm-x86_64/mmzone.h | |||
@@ -42,7 +42,6 @@ static inline __attribute__((pure)) int phys_to_nid(unsigned long addr) | |||
42 | 42 | ||
43 | #ifdef CONFIG_DISCONTIGMEM | 43 | #ifdef CONFIG_DISCONTIGMEM |
44 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) | 44 | #define pfn_to_nid(pfn) phys_to_nid((unsigned long)(pfn) << PAGE_SHIFT) |
45 | #define kvaddr_to_nid(kaddr) phys_to_nid(__pa(kaddr)) | ||
46 | 45 | ||
47 | extern int pfn_valid(unsigned long pfn); | 46 | extern int pfn_valid(unsigned long pfn); |
48 | #endif | 47 | #endif |