| Message ID | 20231201062538.27240-1-bhe@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d53a154cdc54b4fa2dbbf10646d613b0b664b82e |
| Headers | show |
| Series | riscv, kexec: fix the ifdeffery for AFLAGS_kexec_relocate.o | expand |
CC Andrew. On 12/01/23 at 02:25pm, Baoquan He wrote: > This was introduced in commit fba8a8674f68 ("RISC-V: Add kexec > support"). > > It should work on CONFIG_KEXEC_CORE, but not CONFIG_KEXEC only, since > we could set CONFIG_KEXEC_FILE=y and CONFIG_KEXEC=N, or only set > CONFIG_CRASH_DUMP=y and disable both CONFIG_KEXEC and CONFIG_KEXEC_FILE. > In these cases, the AFLAGS won't take effect with the current ifdeffery > for AFLAGS_kexec_relocate.o. > > So fix it now. > > Signed-off-by: Baoquan He <bhe@redhat.com> > --- > arch/riscv/kernel/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Hi RISC-V people, I didn't test this, while believe this need be fixed. Please help check if this is necessary. Thanks Baoquan > > diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile > index fee22a3d1b53..82940b6a79a2 100644 > --- a/arch/riscv/kernel/Makefile > +++ b/arch/riscv/kernel/Makefile > @@ -11,7 +11,7 @@ endif > CFLAGS_syscall_table.o += $(call cc-option,-Wno-override-init,) > CFLAGS_compat_syscall_table.o += $(call cc-option,-Wno-override-init,) > > -ifdef CONFIG_KEXEC > +ifdef CONFIG_KEXEC_CORE > AFLAGS_kexec_relocate.o := -mcmodel=medany $(call cc-option,-mno-relax) > endif > > -- > 2.41.0 >
Hello: This patch was applied to riscv/linux.git (fixes) by Andrew Morton <akpm@linux-foundation.org>: On Fri, 1 Dec 2023 14:25:38 +0800 you wrote: > This was introduced in commit fba8a8674f68 ("RISC-V: Add kexec > support"). > > It should work on CONFIG_KEXEC_CORE, but not CONFIG_KEXEC only, since > we could set CONFIG_KEXEC_FILE=y and CONFIG_KEXEC=N, or only set > CONFIG_CRASH_DUMP=y and disable both CONFIG_KEXEC and CONFIG_KEXEC_FILE. > In these cases, the AFLAGS won't take effect with the current ifdeffery > for AFLAGS_kexec_relocate.o. > > [...] Here is the summary with links: - riscv, kexec: fix the ifdeffery for AFLAGS_kexec_relocate.o https://git.kernel.org/riscv/c/d53a154cdc54 You are awesome, thank you!
diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index fee22a3d1b53..82940b6a79a2 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -11,7 +11,7 @@ endif CFLAGS_syscall_table.o += $(call cc-option,-Wno-override-init,) CFLAGS_compat_syscall_table.o += $(call cc-option,-Wno-override-init,) -ifdef CONFIG_KEXEC +ifdef CONFIG_KEXEC_CORE AFLAGS_kexec_relocate.o := -mcmodel=medany $(call cc-option,-mno-relax) endif
This was introduced in commit fba8a8674f68 ("RISC-V: Add kexec support"). It should work on CONFIG_KEXEC_CORE, but not CONFIG_KEXEC only, since we could set CONFIG_KEXEC_FILE=y and CONFIG_KEXEC=N, or only set CONFIG_CRASH_DUMP=y and disable both CONFIG_KEXEC and CONFIG_KEXEC_FILE. In these cases, the AFLAGS won't take effect with the current ifdeffery for AFLAGS_kexec_relocate.o. So fix it now. Signed-off-by: Baoquan He <bhe@redhat.com> --- arch/riscv/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)