Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bb25df0 authored Aug 30, 2013 by Jianguo Wu Committed by Rafael J. Wysocki Sep 24, 2013

ACPI / mm: use NUMA_NO_NODE



Use more appropriate NUMA_NO_NODE instead of -1

Signed-off-by: Jianguo Wu <wujianguo@huawei.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 4a10c2ac

drivers/acpi/acpi_memhotplug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device)
		if (!info->enabled)
		continue;

		if (nid < 0)
		if (nid == NUMA_NO_NODE)
		nid = memory_add_physaddr_to_nid(info->start_addr);

		acpi_unbind_memory_blocks(info, handle);

drivers/acpi/numa.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ int acpi_map_pxm_to_node(int pxm)
		{
		int node = pxm_to_node_map[pxm];

		if (node < 0) {
		if (node == NUMA_NO_NODE) {
		if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
		return NUMA_NO_NODE;
		node = first_unset_node(nodes_found_map);
		@@ -334,7 +334,7 @@ int acpi_get_pxm(acpi_handle h)

		int acpi_get_node(acpi_handle *handle)
		{
		int pxm, node = -1;
		int pxm, node = NUMA_NO_NODE;

		pxm = acpi_get_pxm(handle);
		if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)