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

Commit b552a8c5 authored by David Rientjes's avatar David Rientjes Committed by Len Brown
Browse files

ACPI: remove NID_INVAL 



NUMA_NO_NODE has been exported globally and thus it can replace NID_INVAL
in the acpi code.

Also removes the unused acpi_unmap_pxm_to_node() function.

[akpm@linux-foundation.org: coding-style fixes]
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2345baf4

drivers/acpi/numa.c

+6 −15
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/types.h>

#include <linux/errno.h>

#include <linux/acpi.h>

#include <linux/numa.h>

#include <acpi/acpi_bus.h>



#define PREFIX "ACPI: "
@@ -40,14 +41,14 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE; 


/* maps to convert between proximity domain and logical node ID */

static int pxm_to_node_map[MAX_PXM_DOMAINS]

				= { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };

			= { [0 ... MAX_PXM_DOMAINS - 1] = NUMA_NO_NODE };

static int node_to_pxm_map[MAX_NUMNODES]

			= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };



int pxm_to_node(int pxm)

{

	if (pxm < 0)

		return NID_INVAL;

		return NUMA_NO_NODE;

	return pxm_to_node_map[pxm];

}
@@ -70,7 +71,7 @@ int acpi_map_pxm_to_node(int pxm) 


	if (node < 0) {

		if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)

			return NID_INVAL;

			return NUMA_NO_NODE;

		node = first_unset_node(nodes_found_map);

		__acpi_map_pxm_to_node(pxm, node);

		node_set(node, nodes_found_map);
@@ -79,16 +80,6 @@ int acpi_map_pxm_to_node(int pxm) 
	return node;

}



#if 0

void __cpuinit acpi_unmap_pxm_to_node(int node)

{

	int pxm = node_to_pxm_map[node];

	pxm_to_node_map[pxm] = NID_INVAL;

	node_to_pxm_map[node] = PXM_INVAL;

	node_clear(node, nodes_found_map);

}

#endif  /*  0  */



static void __init

acpi_table_print_srat_entry(struct acpi_subtable_header *header)

{