lkml.org 
[lkml]   [2019]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 093/148] powerpc: consolidate -mno-sched-epilog into FTRACE flags
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

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

    From: Nicholas Piggin <npiggin@gmail.com>

    commit 2a056f58fd33ccc6a0261b552b0f17e7fa4a12f3 upstream.

    Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
    Reviewed-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/powerpc/Makefile | 12 ++++++------
    arch/powerpc/kernel/Makefile | 8 ++++----
    arch/powerpc/kernel/trace/Makefile | 2 +-
    arch/powerpc/platforms/powermac/Makefile | 2 +-
    arch/powerpc/xmon/Makefile | 2 +-
    5 files changed, 13 insertions(+), 13 deletions(-)

    --- a/arch/powerpc/Makefile
    +++ b/arch/powerpc/Makefile
    @@ -160,8 +160,13 @@ else
    CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
    endif

    +ifdef CONFIG_FUNCTION_TRACER
    +CC_FLAGS_FTRACE := -pg
    ifdef CONFIG_MPROFILE_KERNEL
    - CC_FLAGS_FTRACE := -pg -mprofile-kernel
    +CC_FLAGS_FTRACE += -mprofile-kernel
    +endif
    +# Work around a gcc code-gen bug with -fno-omit-frame-pointer.
    +CC_FLAGS_FTRACE += -mno-sched-epilog
    endif

    CFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU))
    @@ -229,11 +234,6 @@ ifdef CONFIG_6xx
    KBUILD_CFLAGS += -mcpu=powerpc
    endif

    -# Work around a gcc code-gen bug with -fno-omit-frame-pointer.
    -ifdef CONFIG_FUNCTION_TRACER
    -KBUILD_CFLAGS += -mno-sched-epilog
    -endif
    -
    cpu-as-$(CONFIG_4xx) += -Wa,-m405
    cpu-as-$(CONFIG_ALTIVEC) += $(call as-option,-Wa$(comma)-maltivec)
    cpu-as-$(CONFIG_E200) += -Wa,-me200
    --- a/arch/powerpc/kernel/Makefile
    +++ b/arch/powerpc/kernel/Makefile
    @@ -22,10 +22,10 @@ CFLAGS_prom.o += $(DISABLE_LATENT_ENTROP

    ifdef CONFIG_FUNCTION_TRACER
    # Do not trace early boot code
    -CFLAGS_REMOVE_cputable.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    -CFLAGS_REMOVE_prom_init.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    -CFLAGS_REMOVE_btext.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    -CFLAGS_REMOVE_prom.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_cputable.o = $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_prom_init.o = $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_btext.o = $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_prom.o = $(CC_FLAGS_FTRACE)
    endif

    obj-y := cputable.o ptrace.o syscalls.o \
    --- a/arch/powerpc/kernel/trace/Makefile
    +++ b/arch/powerpc/kernel/trace/Makefile
    @@ -7,7 +7,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -

    ifdef CONFIG_FUNCTION_TRACER
    # do not trace tracer code
    -CFLAGS_REMOVE_ftrace.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
    endif

    obj32-$(CONFIG_FUNCTION_TRACER) += ftrace_32.o
    --- a/arch/powerpc/platforms/powermac/Makefile
    +++ b/arch/powerpc/platforms/powermac/Makefile
    @@ -3,7 +3,7 @@ CFLAGS_bootx_init.o += -fPIC

    ifdef CONFIG_FUNCTION_TRACER
    # Do not trace early boot code
    -CFLAGS_REMOVE_bootx_init.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)
    +CFLAGS_REMOVE_bootx_init.o = $(CC_FLAGS_FTRACE)
    endif

    obj-y += pic.o setup.o time.o feature.o pci.o \
    --- a/arch/powerpc/xmon/Makefile
    +++ b/arch/powerpc/xmon/Makefile
    @@ -8,7 +8,7 @@ UBSAN_SANITIZE := n

    # Disable ftrace for the entire directory
    ORIG_CFLAGS := $(KBUILD_CFLAGS)
    -KBUILD_CFLAGS = $(subst -mno-sched-epilog,,$(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS)))
    +KBUILD_CFLAGS = $(subst $(CC_FLAGS_FTRACE),,$(ORIG_CFLAGS))

    ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)


    \
     
     \ /
      Last update: 2019-01-11 15:52    [W:4.177 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site