Skip to content

Commit

Permalink
Fix build error for numa_clear_node() under IA64
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yijing Wang authored and Tony Luck committed Apr 2, 2013
1 parent d303e9e commit eee46b3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/ia64/include/asm/numa.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
5 changes: 5 additions & 0 deletions arch/ia64/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit eee46b3

Please sign in to comment.