Skip to content

Commit f1eecf0

Browse files
Steven RostedtIngo Molnar
authored andcommitted
powerpc/ppc32: static ftrace fixes for PPC32
Impact: fix for PowerPC 32 code There were some early init code that was not safe for static ftrace to boot on my PowerBook. This code must only use relative addressing, and static mcount performs a compare of the ftrace_trace_function pointer, and gets that with an absolute address. In the early init boot up code, this will cause a fault. This patch removes tracing from the files containing the offending functions. Signed-off-by: Steven Rostedt <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent 0029ff8 commit f1eecf0

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

arch/powerpc/kernel/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ifdef CONFIG_FUNCTION_TRACER
1717
CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
1818
CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog
1919
CFLAGS_REMOVE_btext.o = -pg -mno-sched-epilog
20+
CFLAGS_REMOVE_prom.o = -pg -mno-sched-epilog
2021

2122
ifdef CONFIG_DYNAMIC_FTRACE
2223
# dynamic ftrace setup.

arch/powerpc/lib/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ ifeq ($(CONFIG_PPC64),y)
66
EXTRA_CFLAGS += -mno-minimal-toc
77
endif
88

9+
CFLAGS_REMOVE_code-patching.o = -pg
10+
CFLAGS_REMOVE_feature-fixups.o = -pg
11+
912
obj-y := string.o alloc.o \
1013
checksum_$(CONFIG_WORD_SIZE).o
1114
obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o

0 commit comments

Comments
 (0)