From e7d30f4c8cc5b2f30b95cac48ac8a0c4be9fca22 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 5 Jan 2022 16:14:18 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Generate hyp-constants.o as an nVHE object A number of KVM definitions are keyd on _KVM_NVHE_HYPERVISOR__ being defined or not. Make sure we advertise this #define when compiling hyp-constants.o, so that we get the right stuff. Signed-off-by: Marc Zyngier Bug: 209580772 Change-Id: Ied191c0a18274258cffede72b06b0fb5bba5604e Signed-off-by: Will Deacon --- arch/arm64/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index d0058919a2d5..4c94585689a9 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -32,7 +32,7 @@ define rule_gen_hyp_constants $(call filechk,offsets,__HYP_CONSTANTS_H__) endef -CFLAGS_hyp-constants.o = -I $(srctree)/$(src)/hyp/include +CFLAGS_hyp-constants.o = -I $(srctree)/$(src)/hyp/include -D__KVM_NVHE_HYPERVISOR__=1 $(obj)/hyp-constants.s: $(src)/hyp/hyp-constants.c FORCE $(call if_changed_dep,cc_s_c)