[PATCH] KVM: arm: add Kbuild FORCE prerequisite for hyp-reloc

Arnd Bergmann
2021-09-20T10:05:23Z

From: Arnd Bergmann <arnd@arndb.de>

Commit e1f86d7b4b2a ("kbuild: warn if FORCE is missing for if_changed(_dep,_rule)
and filechk") added a helpful check for Kbuild, which now notices
that a problem with the hyp-reloc rule:

arch/arm64/kvm/hyp/nvhe/Makefile:58: FORCE prerequisite is missing

Do as suggested and add FORCE here.

Fixes: 8c49b5d43d4c ("KVM: arm64: Generate hyp relocation data")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm64/kvm/hyp/nvhe/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index 5df6193fc430..8d741f71377f 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE
# runtime. Because the hypervisor is part of the kernel binary, relocations
# produce a kernel VA. We enumerate relocations targeting hyp at build time
# and convert the kernel VAs at those positions to hyp VAs.
-$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel
+$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE
$(call if_changed,hyprel)

# 5) Compile hyp-reloc.S and link it into the existing partially linked object.
--
2.29.2