|
@@ -3616,34 +3616,6 @@ static int __meminit next_active_region_index_in_nid(int index, int nid)
|
|
return -1;
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
-/*
|
|
|
|
- * Basic iterator support. Return the last range of PFNs for a node
|
|
|
|
- * Note: nid == MAX_NUMNODES returns last region regardless of node
|
|
|
|
- */
|
|
|
|
-static int __meminit last_active_region_index_in_nid(int nid)
|
|
|
|
-{
|
|
|
|
- int i;
|
|
|
|
-
|
|
|
|
- for (i = nr_nodemap_entries - 1; i >= 0; i--)
|
|
|
|
- if (nid == MAX_NUMNODES || early_node_map[i].nid == nid)
|
|
|
|
- return i;
|
|
|
|
-
|
|
|
|
- return -1;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
-/*
|
|
|
|
- * Basic iterator support. Return the previous active range of PFNs for a node
|
|
|
|
- * Note: nid == MAX_NUMNODES returns next region regardless of node
|
|
|
|
- */
|
|
|
|
-static int __meminit previous_active_region_index_in_nid(int index, int nid)
|
|
|
|
-{
|
|
|
|
- for (index = index - 1; index >= 0; index--)
|
|
|
|
- if (nid == MAX_NUMNODES || early_node_map[index].nid == nid)
|
|
|
|
- return index;
|
|
|
|
-
|
|
|
|
- return -1;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
|
|
#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
|
|
/*
|
|
/*
|
|
* Required by SPARSEMEM. Given a PFN, return what node the PFN is on.
|
|
* Required by SPARSEMEM. Given a PFN, return what node the PFN is on.
|
|
@@ -3695,10 +3667,6 @@ bool __meminit early_pfn_in_nid(unsigned long pfn, int node)
|
|
for (i = first_active_region_index_in_nid(nid); i != -1; \
|
|
for (i = first_active_region_index_in_nid(nid); i != -1; \
|
|
i = next_active_region_index_in_nid(i, nid))
|
|
i = next_active_region_index_in_nid(i, nid))
|
|
|
|
|
|
-#define for_each_active_range_index_in_nid_reverse(i, nid) \
|
|
|
|
- for (i = last_active_region_index_in_nid(nid); i != -1; \
|
|
|
|
- i = previous_active_region_index_in_nid(i, nid))
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* free_bootmem_with_active_regions - Call free_bootmem_node for each active range
|
|
* free_bootmem_with_active_regions - Call free_bootmem_node for each active range
|
|
* @nid: The node to free memory on. If MAX_NUMNODES, all nodes are freed.
|
|
* @nid: The node to free memory on. If MAX_NUMNODES, all nodes are freed.
|
|
@@ -3731,6 +3699,38 @@ void __init free_bootmem_with_active_regions(int nid,
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK
|
|
#ifdef CONFIG_HAVE_MEMBLOCK
|
|
|
|
+/*
|
|
|
|
+ * Basic iterator support. Return the last range of PFNs for a node
|
|
|
|
+ * Note: nid == MAX_NUMNODES returns last region regardless of node
|
|
|
|
+ */
|
|
|
|
+static int __meminit last_active_region_index_in_nid(int nid)
|
|
|
|
+{
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ for (i = nr_nodemap_entries - 1; i >= 0; i--)
|
|
|
|
+ if (nid == MAX_NUMNODES || early_node_map[i].nid == nid)
|
|
|
|
+ return i;
|
|
|
|
+
|
|
|
|
+ return -1;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Basic iterator support. Return the previous active range of PFNs for a node
|
|
|
|
+ * Note: nid == MAX_NUMNODES returns next region regardless of node
|
|
|
|
+ */
|
|
|
|
+static int __meminit previous_active_region_index_in_nid(int index, int nid)
|
|
|
|
+{
|
|
|
|
+ for (index = index - 1; index >= 0; index--)
|
|
|
|
+ if (nid == MAX_NUMNODES || early_node_map[index].nid == nid)
|
|
|
|
+ return index;
|
|
|
|
+
|
|
|
|
+ return -1;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+#define for_each_active_range_index_in_nid_reverse(i, nid) \
|
|
|
|
+ for (i = last_active_region_index_in_nid(nid); i != -1; \
|
|
|
|
+ i = previous_active_region_index_in_nid(i, nid))
|
|
|
|
+
|
|
u64 __init find_memory_core_early(int nid, u64 size, u64 align,
|
|
u64 __init find_memory_core_early(int nid, u64 size, u64 align,
|
|
u64 goal, u64 limit)
|
|
u64 goal, u64 limit)
|
|
{
|
|
{
|