Skip to content

Commit 9eac3f9

Browse files
guoren83smb49
authored andcommitted
riscv: Fixup wrong ftrace remove cflag
BugLink: https://bugs.launchpad.net/bugs/1944610 commit 67d9457 upstream. We must use $(CC_FLAGS_FTRACE) instead of directly using -pg. It will cause -fpatchable-function-entry error. Signed-off-by: Guo Ren <guoren@linux.alibaba.com> Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 2c03e8d commit 9eac3f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

arch/riscv/kernel/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55

66
ifdef CONFIG_FTRACE
7-
CFLAGS_REMOVE_ftrace.o = -pg
8-
CFLAGS_REMOVE_patch.o = -pg
7+
CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
8+
CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE)
99
endif
1010

1111
extra-y += head.o

arch/riscv/mm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
CFLAGS_init.o := -mcmodel=medany
44
ifdef CONFIG_FTRACE
5-
CFLAGS_REMOVE_init.o = -pg
5+
CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE)
66
endif
77

88
KCOV_INSTRUMENT_init.o := n

0 commit comments

Comments
 (0)