On Tue, Feb 02, 2016 at 07:30:12PM +0800, Hanjun Guo wrote:

[...]

quoted

How about the following (similar to x86)?

----
if (!numa_off) {
#ifdef CONFIG_ACPI_NUMA
	if (!numa_init(acpi_numa_init))
		return 0;
#endif
#ifdef CONFIG_OF_NUMA
	if (!numa_init(of_numa_init))
		return 0;
#endif
}

return numa_init(dummy_numa_init);
----

Pretty straight and nice.

Note: The !acpi_disabled check needs to be moved to the beginning of
acpi_numa_init(). Variable ret can be removed.

Lorenzo suggested to remove it, Lorenzo, what's your opinion here?

I do not think it is a big deal. OF is not a fall-back for ACPI,
which is what the code above may make us think, either you parse
ACPI or you parse DT.

I will have a look at the complete code to check if we can rewrite
it differently but I would not be too worried about it.

Lorenzo