[PATCH 1/2] mm/memblock: use NUMA_NO_NODE instead of MAX_NUMNODES as default node_id

[Wei Yang]

According to commit <b115423357e0> ('mm/memblock: switch to use
NUMA_NO_NODE instead of MAX_NUMNODES'), MAX_NUMNODES is not preferred as an
node_id indicator.

This patch use NUMA_NO_NODE as the default node_id for memblock.

Signed-off-by: Wei Yang <richard.weiy...@gmail.com>
---
 arch/x86/mm/numa.c | 6 +++---
 mm/memblock.c      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 3f35b48d1d9d..4366242356c5 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -506,7 +506,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
         *   reserve specific pages for Sandy Bridge graphics. ]
         */
        for_each_memblock(reserved, mb_region) {
-               if (mb_region->nid != MAX_NUMNODES)
+               if (mb_region->nid != NUMA_NO_NODE)
                        node_set(mb_region->nid, reserved_nodemask);
        }
 
@@ -633,9 +633,9 @@ static int __init numa_init(int (*init_func)(void))
        nodes_clear(node_online_map);
        memset(&numa_meminfo, 0, sizeof(numa_meminfo));
        WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
-                                 MAX_NUMNODES));
+                                 NUMA_NO_NODE));
        WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.reserved,
-                                 MAX_NUMNODES));
+                                 NUMA_NO_NODE));
        /* In case that parsing SRAT failed. */
        WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
        numa_reset_distance();
diff --git a/mm/memblock.c b/mm/memblock.c
index d0f2c9632187..7d27566cee11 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -292,7 +292,7 @@ static void __init_memblock memblock_remove_region(struct 
memblock_type *type, u
                type->regions[0].base = 0;
                type->regions[0].size = 0;
                type->regions[0].flags = 0;
-               memblock_set_region_node(&type->regions[0], MAX_NUMNODES);
+               memblock_set_region_node(&type->regions[0], NUMA_NO_NODE);
        }
 }
 
@@ -616,7 +616,7 @@ int __init_memblock memblock_add(phys_addr_t base, 
phys_addr_t size)
                     (unsigned long long)base + size - 1,
                     0UL, (void *)_RET_IP_);
 
-       return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 
0);
+       return memblock_add_range(&memblock.memory, base, size, NUMA_NO_NODE, 
0);
 }
 
 /**
@@ -734,7 +734,7 @@ int __init_memblock memblock_reserve(phys_addr_t base, 
phys_addr_t size)
                     (unsigned long long)base + size - 1,
                     0UL, (void *)_RET_IP_);
 
-       return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 
0);
+       return memblock_add_range(&memblock.reserved, base, size, NUMA_NO_NODE, 
0);
 }
 
 /**
@@ -1684,7 +1684,7 @@ static void __init_memblock memblock_dump(struct 
memblock_type *type, char *name
                size = rgn->size;
                flags = rgn->flags;
 #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
-               if (memblock_get_region_node(rgn) != MAX_NUMNODES)
+               if (memblock_get_region_node(rgn) != NUMA_NO_NODE)
                        snprintf(nid_buf, sizeof(nid_buf), " on node %d",
                                 memblock_get_region_node(rgn));
 #endif
-- 
2.11.0