|
@@ -785,11 +785,9 @@ void __init_memblock __next_free_mem_range(u64 *idx, int nid,
|
|
|
struct memblock_type *rsv = &memblock.reserved;
|
|
|
int mi = *idx & 0xffffffff;
|
|
|
int ri = *idx >> 32;
|
|
|
- bool check_node = (nid != NUMA_NO_NODE) && (nid != MAX_NUMNODES);
|
|
|
|
|
|
- if (nid == MAX_NUMNODES)
|
|
|
- pr_warn_once("%s: Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n",
|
|
|
- __func__);
|
|
|
+ if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
|
+ nid = NUMA_NO_NODE;
|
|
|
|
|
|
for ( ; mi < mem->cnt; mi++) {
|
|
|
struct memblock_region *m = &mem->regions[mi];
|
|
@@ -797,7 +795,7 @@ void __init_memblock __next_free_mem_range(u64 *idx, int nid,
|
|
|
phys_addr_t m_end = m->base + m->size;
|
|
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
|
|
- if (check_node && nid != memblock_get_region_node(m))
|
|
|
+ if (nid != NUMA_NO_NODE && nid != memblock_get_region_node(m))
|
|
|
continue;
|
|
|
|
|
|
/* scan areas before each reservation for intersection */
|
|
@@ -858,11 +856,9 @@ void __init_memblock __next_free_mem_range_rev(u64 *idx, int nid,
|
|
|
struct memblock_type *rsv = &memblock.reserved;
|
|
|
int mi = *idx & 0xffffffff;
|
|
|
int ri = *idx >> 32;
|
|
|
- bool check_node = (nid != NUMA_NO_NODE) && (nid != MAX_NUMNODES);
|
|
|
|
|
|
- if (nid == MAX_NUMNODES)
|
|
|
- pr_warn_once("%s: Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n",
|
|
|
- __func__);
|
|
|
+ if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
|
+ nid = NUMA_NO_NODE;
|
|
|
|
|
|
if (*idx == (u64)ULLONG_MAX) {
|
|
|
mi = mem->cnt - 1;
|
|
@@ -875,7 +871,7 @@ void __init_memblock __next_free_mem_range_rev(u64 *idx, int nid,
|
|
|
phys_addr_t m_end = m->base + m->size;
|
|
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
|
|
- if (check_node && nid != memblock_get_region_node(m))
|
|
|
+ if (nid != NUMA_NO_NODE && nid != memblock_get_region_node(m))
|
|
|
continue;
|
|
|
|
|
|
/* skip hotpluggable memory regions if needed */
|
|
@@ -1067,9 +1063,8 @@ static void * __init memblock_virt_alloc_internal(
|
|
|
phys_addr_t alloc;
|
|
|
void *ptr;
|
|
|
|
|
|
- if (nid == MAX_NUMNODES)
|
|
|
- pr_warn("%s: usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE\n",
|
|
|
- __func__);
|
|
|
+ if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
|
+ nid = NUMA_NO_NODE;
|
|
|
|
|
|
/*
|
|
|
* Detect any accidental use of these APIs after slab is ready, as at
|