lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 030/330] powerpc/64s: Always disable branch profiling for prom_init.o
    Date
    From: Michael Ellerman <mpe@ellerman.id.au>

    [ Upstream commit 6266a4dadb1d0976490fdf5af4f7941e36f64e80 ]

    Otherwise the build fails because prom_init is calling symbols it's
    not allowed to, eg:

    Error: External symbol 'ftrace_likely_update' referenced from prom_init.c
    make[3]: *** [arch/powerpc/kernel/Makefile:197: arch/powerpc/kernel/prom_init_check] Error 1

    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/20191106051129.7626-1-mpe@ellerman.id.au
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/kernel/Makefile | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
    index dc0780f930d5b..59260eb962916 100644
    --- a/arch/powerpc/kernel/Makefile
    +++ b/arch/powerpc/kernel/Makefile
    @@ -19,6 +19,7 @@ CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)
    CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

    CFLAGS_prom_init.o += $(call cc-option, -fno-stack-protector)
    +CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING

    ifdef CONFIG_FUNCTION_TRACER
    # Do not trace early boot code
    @@ -36,7 +37,6 @@ KASAN_SANITIZE_btext.o := n
    ifdef CONFIG_KASAN
    CFLAGS_early_32.o += -DDISABLE_BRANCH_PROFILING
    CFLAGS_cputable.o += -DDISABLE_BRANCH_PROFILING
    -CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING
    CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING
    endif

    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 05:15    [W:2.710 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site