Home Home > GIT Browse
diff options
authorThomas Tai <thomas.tai@oracle.com>2016-11-11 16:41:00 -0800
committerJiri Slaby <jslaby@suse.cz>2016-12-13 17:01:13 +0100
commitbc38f4f1a7d51f36112723fe6aa74800995c0ef4 (patch)
parentd68ed46bd6c06585e61556d4a7171d8ea198101c (diff)
sparc64: fix compile warning section mismatch in find_node()
[ Upstream commit 87a349f9cc0908bc0cfac0c9ece3179f650ae95a ] A compile warning is introduced by a commit to fix the find_node(). This patch fix the compile warning by moving find_node() into __init section. Because find_node() is only used by memblock_nid_range() which is only used by a __init add_node_ranges(). find_node() and memblock_nid_range() should also be inside __init section. Signed-off-by: Thomas Tai <thomas.tai@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 5979f01af0d2..a648a8e66f0d 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -810,7 +810,7 @@ static int num_mblocks;
static int find_numa_node_for_addr(unsigned long pa,
struct node_mem_mask *pnode_mask);
-static unsigned long ra_to_pa(unsigned long addr)
+static unsigned long __init ra_to_pa(unsigned long addr)
int i;
@@ -826,7 +826,7 @@ static unsigned long ra_to_pa(unsigned long addr)
return addr;
-static int find_node(unsigned long addr)
+static int __init find_node(unsigned long addr)
static bool search_mdesc = true;
static struct node_mem_mask last_mem_mask = { ~0UL, ~0UL };
@@ -863,7 +863,7 @@ static int find_node(unsigned long addr)
return last_index;
-static u64 memblock_nid_range(u64 start, u64 end, int *nid)
+static u64 __init memblock_nid_range(u64 start, u64 end, int *nid)
*nid = find_node(start);
start += PAGE_SIZE;