riscv: Fixup wrong ftrace remove cflag

guoren83 · gregkh · commit 7e2087249e87 · 2021-09-03T10:09:28.000+02:00
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>
diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile
@@ -4,8 +4,8 @@
 #
 
 ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_ftrace.o	= -pg
-CFLAGS_REMOVE_patch.o	= -pg
+CFLAGS_REMOVE_ftrace.o	= $(CC_FLAGS_FTRACE)
+CFLAGS_REMOVE_patch.o	= $(CC_FLAGS_FTRACE)
 endif
 
 extra-y += head.o
diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile
@@ -2,7 +2,7 @@
 
 CFLAGS_init.o := -mcmodel=medany
 ifdef CONFIG_FTRACE
-CFLAGS_REMOVE_init.o = -pg
+CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE)
 endif
 
 KCOV_INSTRUMENT_init.o := n

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`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)`
`9`	`9`	`endif`
`10`	`10`
`11`	`11`	`extra-y += head.o`