Merge tag 'riscv-for-linus-6.9-mw2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / riscv / kernel / Makefile

diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile
index c8085126a6f98969ec27ab46af8ca8dfe77a3bf4..81d94a8ee10f29d3104a4f82c58eba92d124c329 100644 (file)
--- a/arch/riscv/kernel/Makefile
+++ b/arch/riscv/kernel/Makefile
@@ -7,6 +7,7 @@ ifdef CONFIG_FTRACE
 CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_patch.o  = $(CC_FLAGS_FTRACE)
 CFLAGS_REMOVE_sbi.o    = $(CC_FLAGS_FTRACE)
+CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE)
 endif
 CFLAGS_syscall_table.o += $(call cc-option,-Wno-override-init,)
 CFLAGS_compat_syscall_table.o += $(call cc-option,-Wno-override-init,)
@@ -45,6 +46,7 @@ obj-y += irq.o
 obj-y  += process.o
 obj-y  += ptrace.o
 obj-y  += reset.o
+obj-y  += return_address.o
 obj-y  += setup.o
 obj-y  += signal.o
 obj-y  += syscall_table.o
@@ -94,7 +96,7 @@ obj-$(CONFIG_KGDB)            += kgdb.o
 obj-$(CONFIG_KEXEC_CORE)       += kexec_relocate.o crash_save_regs.o machine_kexec.o
 obj-$(CONFIG_KEXEC_FILE)       += elf_kexec.o machine_kexec_file.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump.o
-obj-$(CONFIG_CRASH_CORE)       += crash_core.o
+obj-$(CONFIG_VMCORE_INFO)      += vmcore_info.o
 
 obj-$(CONFIG_JUMP_LABEL)       += jump_label.o