lkml.org 
[lkml]   [2016]   [Dec]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 22/28] sparc64: fix compile warning section mismatch in find_node()
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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;

    \
     
     \ /
      Last update: 2016-12-09 17:19    [W:4.445 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site