* Patch "sparc64: fix compile warning section mismatch in find_node()" has been added to the 4.4-stable tree
@ 2016-12-08 6:20 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-12-08 6:20 UTC (permalink / raw)
To: thomas.tai, davem, gregkh; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
sparc64: fix compile warning section mismatch in find_node()
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sparc64-fix-compile-warning-section-mismatch-in-find_node.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From foo@baz Thu Dec 8 07:19:49 CET 2016
From: Thomas Tai <thomas.tai@oracle.com>
Date: Fri, 11 Nov 2016 16:41:00 -0800
Subject: sparc64: fix compile warning section mismatch in find_node()
From: Thomas Tai <thomas.tai@oracle.com>
[ 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/sparc/mm/init_64.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -803,7 +803,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;
@@ -819,7 +819,7 @@ static unsigned long ra_to_pa(unsigned l
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 };
@@ -856,7 +856,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;
Patches currently in stable-queue which might be from thomas.tai@oracle.com are
queue-4.4/sparc64-fix-compile-warning-section-mismatch-in-find_node.patch
queue-4.4/sparc64-fix-find_node-warning-if-numa-node-cannot-be-found.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-12-08 6:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-08 6:20 Patch "sparc64: fix compile warning section mismatch in find_node()" has been added to the 4.4-stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).