The following commit has been merged into the x86/build branch of tip: Commit-ID: 61922d3fa686733e08387a8a4e11b02b4af6d43c Gitweb: https://git.kernel.org/tip/61922d3fa686733e08387a8a4e11b02b4af6d43c Author: Masahiro Yamada <masahiroy@xxxxxxxxxx> AuthorDate: Mon, 25 Jul 2022 11:08:11 +09:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 25 Jul 2022 10:26:49 +02:00 x86/purgatory: Hard-code obj-y in Makefile arch/x86/Kbuild guards the entire purgatory/ directory, and CONFIG_KEXEC_FILE is bool type. $(CONFIG_KEXEC_FILE) is always 'y' when this directory is being built. Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lore.kernel.org/r/20220725020812.622255-1-masahiroy@xxxxxxxxxx --- arch/x86/purgatory/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index ae53d54..248b009 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile @@ -81,4 +81,4 @@ quiet_cmd_bin2c = BIN2C $@ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro $(obj)/purgatory.chk FORCE $(call if_changed,bin2c) -obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o +obj-y += kexec-purgatory.o
|