diff options
author | Yijing Wang <wangyijing@huawei.com> | 2013-03-20 23:50:30 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2013-04-02 12:39:48 -0400 |
commit | eee46b3de715c9a2a25ebf3c135b88a1d73d92c2 (patch) | |
tree | 8cf2c1ca678099569e4ac3de320596fd926a2798 /arch/ia64 | |
parent | d303e9e98fce56cdb3c6f2ac92f626fc2bd51c77 (diff) |
Fix build error for numa_clear_node() under IA64
numa_clear_node() function is not implemented under IA64,
it will be called in unmap_cpu_on_node() in mm/memory_hotplug.c.
This cause build error under IA64, this patch adds numa_clear_node()
in IA64 to fix this problem.
[Added __cpuinit notation to numa_clear_node() to keep linker happy -Tony]
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/include/asm/numa.h | 5 | ||||
-rw-r--r-- | arch/ia64/mm/numa.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/numa.h b/arch/ia64/include/asm/numa.h index 2e27ef175652..2db0a6c6daa5 100644 --- a/arch/ia64/include/asm/numa.h +++ b/arch/ia64/include/asm/numa.h | |||
@@ -67,14 +67,13 @@ extern int paddr_to_nid(unsigned long paddr); | |||
67 | 67 | ||
68 | extern void map_cpu_to_node(int cpu, int nid); | 68 | extern void map_cpu_to_node(int cpu, int nid); |
69 | extern void unmap_cpu_from_node(int cpu, int nid); | 69 | extern void unmap_cpu_from_node(int cpu, int nid); |
70 | 70 | extern void numa_clear_node(int cpu); | |
71 | 71 | ||
72 | #else /* !CONFIG_NUMA */ | 72 | #else /* !CONFIG_NUMA */ |
73 | #define map_cpu_to_node(cpu, nid) do{}while(0) | 73 | #define map_cpu_to_node(cpu, nid) do{}while(0) |
74 | #define unmap_cpu_from_node(cpu, nid) do{}while(0) | 74 | #define unmap_cpu_from_node(cpu, nid) do{}while(0) |
75 | |||
76 | #define paddr_to_nid(addr) 0 | 75 | #define paddr_to_nid(addr) 0 |
77 | 76 | #define numa_clear_node(cpu) do { } while (0) | |
78 | #endif /* CONFIG_NUMA */ | 77 | #endif /* CONFIG_NUMA */ |
79 | 78 | ||
80 | #endif /* _ASM_IA64_NUMA_H */ | 79 | #endif /* _ASM_IA64_NUMA_H */ |
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 3efea7d0a351..def782e31aac 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c | |||
@@ -73,6 +73,11 @@ int __meminit __early_pfn_to_nid(unsigned long pfn) | |||
73 | return -1; | 73 | return -1; |
74 | } | 74 | } |
75 | 75 | ||
76 | void __cpuinit numa_clear_node(int cpu) | ||
77 | { | ||
78 | unmap_cpu_from_node(cpu, NUMA_NO_NODE); | ||
79 | } | ||
80 | |||
76 | #ifdef CONFIG_MEMORY_HOTPLUG | 81 | #ifdef CONFIG_MEMORY_HOTPLUG |
77 | /* | 82 | /* |
78 | * SRAT information is stored in node_memblk[], then we can use SRAT | 83 | * SRAT information is stored in node_memblk[], then we can use SRAT |