mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 mm: Move early_node_map[] reverse scan helpers under HAVE_MEMBLOCK
Quoted 1 line
From
cc28989437de5617875a2943697fe6ba51a0da8fMon Sep 17 00:00:00 2001
From: Yinghai Lu <[email protected]>
Date: Sat, 26 Feb 2011 13:05:43 +0100
Heiko found recent memblock change triggers these warnings on s390:
mm/page_alloc.c:3623:22: warning: 'last_active_region_index_in_nid' defined but not used mm/page_alloc.c:3638:22: warning: 'previous_active_region_index_in_nid' defined but not used
Need to move those two function under HAVE_MEMBLOCK with its only user, find_memory_core_early().
-tj: Minor updates to description.
Reported-by Heiko Carstens <[email protected]>
Signed-off-by Yinghai Lu <[email protected]>
Signed-off-by Tejun Heo <[email protected]>
---
Applied to x86-mm. Thanks.
mm/page_alloc.c | 64 +++++++++++++++++++++++++++--------------------------- 1 files changed, 32 insertions(+), 32 deletions(-)
mm/page_alloc.c +32 -32
@@ -3616,34 +3616,6 @@ static int __meminit next_active_region_index_in_nid(int index, int nid)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 /* * 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 ; \ 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 * @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 +/* +* 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 goal,u64 limit) {
Signature · 1 line
1.7.1