Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24e26062 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Greg Kroah-Hartman
Browse files

powerpc: consolidate -mno-sched-epilog into FTRACE flags 



commit 2a056f58fd33ccc6a0261b552b0f17e7fa4a12f3 upstream.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5b59eeba

arch/powerpc/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -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

arch/powerpc/kernel/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) 


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 \

arch/powerpc/kernel/trace/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -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

arch/powerpc/platforms/powermac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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 \

arch/powerpc/xmon/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)