Re: memory hotplug function redefinition/confusion

[Randy Dunlap <randy.dunlap@oracle.com>]

On Thu, 16 Nov 2006 20:25:20 -0800 Randy Dunlap wrote:

> 
> 2.6.19-rc5-mm2:
> 
> include/linux/memory_hotplug.h uses CONFIG_NUMA to decide:
> 
> #ifdef CONFIG_NUMA
> extern int memory_add_physaddr_to_nid(u64 start);
> #else
> static inline int memory_add_physaddr_to_nid(u64 start)
> {
> 	return 0;
> }
> #endif
> 
> but mm/init.c uses CONFIG_ACPI_NUMA to decide:
> 
> #ifndef CONFIG_ACPI_NUMA
> int memory_add_physaddr_to_nid(u64 start)
> {
> 	return 0;
> }
> EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
> #endif
> 
> #ifndef CONFIG_ACPI_NUMA
> int memory_add_physaddr_to_nid(u64 start)
> {
> 	return 0;
> }
> #endif
> 
> (sic: duplicate function above)
> 
> The CONFIG_NUMA vs. CONFIG_ACPI_NUMA seems to cause this build error:
> 
>   CC      arch/x86_64/mm/init.o
> arch/x86_64/mm/init.c:501: error: redefinition of 'memory_add_physaddr_to_nid'
> include/linux/memory_hotplug.h:71: error: previous definition of 'memory_add_phys
> addr_to_nid' was here
> arch/x86_64/mm/init.c:509: error: redefinition of 'memory_add_physaddr_to_nid'
> arch/x86_64/mm/init.c:501: error: previous definition of 'memory_add_physaddr_to_
> nid' was here
> make[1]: *** [arch/x86_64/mm/init.o] Error 1
> make: *** [arch/x86_64/mm] Error 2


Actually no flavor of NUMA is set:
http://oss.oracle.com/~rdunlap/configs/config-numa-err

---
~Randy