Merge branch 'misc-2.6.33' into release

1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 2be2fb66204e..7ad48dfc12db 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -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 };
+                        = { [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];
 }
 
@@ -68,9 +69,9 @@ int acpi_map_pxm_to_node(int pxm)
 {
         int node = pxm_to_node_map[pxm];
 
-        if (node < 0){
+        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)
 {