nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ACPI: remove NID_INVAL

Browse source 
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: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
David Rientjes 2009-11-17 14:27:32 -08:00 committed by Len Brown
parent 2345baf4a8
commit b552a8c56d
1 changed files with 6 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/acpi/numa.c
View file

@ -28,6 +28,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/numa.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#define PREFIX "ACPI: " #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 */ /* maps to convert between proximity domain and logical node ID */
static int pxm_to_node_map[MAX_PXM_DOMAINS] 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] static int node_to_pxm_map[MAX_NUMNODES]
= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
int pxm_to_node(int pxm) int pxm_to_node(int pxm)
{ {
if (pxm < 0) if (pxm < 0)
return NID_INVAL; return NUMA_NO_NODE;
return pxm_to_node_map[pxm]; return pxm_to_node_map[pxm];
} }
@ -68,9 +69,9 @@ int acpi_map_pxm_to_node(int pxm)
{ {
int node = pxm_to_node_map[pxm]; int node = pxm_to_node_map[pxm];
if (node < 0){ if (node < 0) {
if (nodes_weight(nodes_found_map) >= MAX_NUMNODES) if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
return NID_INVAL; return NUMA_NO_NODE;
node = first_unset_node(nodes_found_map); node = first_unset_node(nodes_found_map);
__acpi_map_pxm_to_node(pxm, node); __acpi_map_pxm_to_node(pxm, node);
node_set(node, nodes_found_map); node_set(node, nodes_found_map);
@ -79,16 +80,6 @@ int acpi_map_pxm_to_node(int pxm)
return node; 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 static void __init
acpi_table_print_srat_entry(struct acpi_subtable_header *header) acpi_table_print_srat_entry(struct acpi_subtable_header *header)
{ {