diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2013-03-21 11:50:30 +0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2013-04-02 09:39:48 -0700 |
| commit | eee46b3de715c9a2a25ebf3c135b88a1d73d92c2 (patch) | |
| tree | 8cf2c1ca678099569e4ac3de320596fd926a2798 /arch/ia64 | |
| parent | d303e9e98fce56cdb3c6f2ac92f626fc2bd51c77 (diff) | |
| download | linux-stable-eee46b3de715c9a2a25ebf3c135b88a1d73d92c2.tar.gz linux-stable-eee46b3de715c9a2a25ebf3c135b88a1d73d92c2.tar.bz2 linux-stable-eee46b3de715c9a2a25ebf3c135b88a1d73d92c2.zip | |
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); extern void map_cpu_to_node(int cpu, int nid); extern void unmap_cpu_from_node(int cpu, int nid); - +extern void numa_clear_node(int cpu); #else /* !CONFIG_NUMA */ #define map_cpu_to_node(cpu, nid) do{}while(0) #define unmap_cpu_from_node(cpu, nid) do{}while(0) - #define paddr_to_nid(addr) 0 - +#define numa_clear_node(cpu) do { } while (0) #endif /* CONFIG_NUMA */ #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) return -1; } +void __cpuinit numa_clear_node(int cpu) +{ + unmap_cpu_from_node(cpu, NUMA_NO_NODE); +} + #ifdef CONFIG_MEMORY_HOTPLUG /* * SRAT information is stored in node_memblk[], then we can use SRAT |