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

Commit 9a7841ae authored by Torsten Duwe's avatar Torsten Duwe Committed by Michael Ellerman
Browse files

powerpc/ftrace: Use $(CC_FLAGS_FTRACE) when disabling ftrace 



Rather than open-coding -pg whereever we want to disable ftrace, use the
existing $(CC_FLAGS_FTRACE) variable.

This has the advantage that it will work in future when we use a
different set of flags to enable ftrace.

Signed-off-by: default avatarTorsten Duwe <duwe@suse.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c96f8385

arch/powerpc/kernel/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ endif 


ifdef CONFIG_FUNCTION_TRACER

# Do not trace early boot code

CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_prom.o = -pg -mno-sched-epilog

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)

# do not trace tracer code

CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_ftrace.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)

# timers used by tracing

CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_time.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)

endif



obj-y				:= cputable.o ptrace.o syscalls.o \

arch/powerpc/lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror 


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



CFLAGS_REMOVE_code-patching.o = -pg

CFLAGS_REMOVE_feature-fixups.o = -pg

CFLAGS_REMOVE_code-patching.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_feature-fixups.o = $(CC_FLAGS_FTRACE)



obj-y += string.o alloc.o crtsavres.o ppc_ksyms.o code-patching.o \

	 feature-fixups.o

arch/powerpc/platforms/powermac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ CFLAGS_bootx_init.o += -fPIC 


ifdef CONFIG_FUNCTION_TRACER

# Do not trace early boot code

CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog

CFLAGS_REMOVE_bootx_init.o = -mno-sched-epilog $(CC_FLAGS_FTRACE)

endif



obj-y				+= pic.o setup.o time.o feature.o pci.o \