The following commit has been merged into the x86/build branch of tip:
Commit-ID: e3c7c1052271260955affbe65c4f328286fbe5fb
Gitweb: https://git.kernel.org/tip/e3c7c1052271260955affbe65c4f328286fbe5fb
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
AuthorDate: Sat, 15 Feb 2020 15:32:41 +09:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 21 Apr 2020 10:17:29 +02:00
x86/boot/build: Add cpustr.h to targets and remove clean-files
Files in $(targets) are always cleaned up. Move the 'targets' assignment
out of the ifdef and remove 'clean-files'.
Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200215063241.7437-1-masahiroy@xxxxxxxxxx
---
arch/x86/boot/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index e17be90..02c8d1c 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -57,11 +57,10 @@ $(obj)/cpu.o: $(obj)/cpustr.h
quiet_cmd_cpustr = CPUSTR $@
cmd_cpustr = $(obj)/mkcpustr > $@
-targets += cpustr.h
$(obj)/cpustr.h: $(obj)/mkcpustr FORCE
$(call if_changed,cpustr)
endif
-clean-files += cpustr.h
+targets += cpustr.h
# ---------------------------------------------------------------------------
|