diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
| commit | 14ef9d04928b61d699fd0dd858b14b5d8150113e (patch) | |
| tree | 267d772b7068f7d0da04cf421286c65f2599f472 /arch/arm64/kvm/hyp/Makefile | |
| parent | 2e02cbb236d6ac12e04629f94b7032a94f968165 (diff) | |
| parent | 816c347f3a48fb15370b23664760ea61286fea05 (diff) | |
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/Makefile')
| -rw-r--r-- | arch/arm64/kvm/hyp/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 607b8a898826..4a81eddabcd8 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -10,5 +10,4 @@ subdir-ccflags-y := -I$(incdir) \ -DDISABLE_BRANCH_PROFILING \ $(DISABLE_STACKLEAK_PLUGIN) -obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o -obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o +obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o smccc_wa.o |