lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 101/186] x86/unwind/orc: Fix !CONFIG_MODULES build warning
    Date
    From: Shile Zhang <shile.zhang@linux.alibaba.com>

    [ Upstream commit 22a7fa8848c5e881d87ef2f7f3c2ea77b286e6f9 ]

    To fix follwowing warning due to ORC sort moved to build time:

    arch/x86/kernel/unwind_orc.c:210:12: warning: ‘orc_sort_cmp’ defined but not used [-Wunused-function]
    arch/x86/kernel/unwind_orc.c:190:13: warning: ‘orc_sort_swap’ defined but not used [-Wunused-function]

    Signed-off-by: Shile Zhang <shile.zhang@linux.alibaba.com>
    Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: https://lkml.kernel.org/r/c9c81536-2afc-c8aa-c5f8-c7618ecd4f54@linux.alibaba.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kernel/unwind_orc.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c
    index 3bbb399f7ead3..5ac0e0359b668 100644
    --- a/arch/x86/kernel/unwind_orc.c
    +++ b/arch/x86/kernel/unwind_orc.c
    @@ -131,6 +131,8 @@ static struct orc_entry *orc_find(unsigned long ip)
    return orc_module_find(ip);
    }

    +#ifdef CONFIG_MODULES
    +
    static void orc_sort_swap(void *_a, void *_b, int size)
    {
    struct orc_entry *orc_a, *orc_b;
    @@ -173,7 +175,6 @@ static int orc_sort_cmp(const void *_a, const void *_b)
    return orc_a->sp_reg == ORC_REG_UNDEFINED ? -1 : 1;
    }

    -#ifdef CONFIG_MODULES
    void unwind_module_init(struct module *mod, void *_orc_ip, size_t orc_ip_size,
    void *_orc, size_t orc_size)
    {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 17:20    [W:2.745 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site