summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm/Makefile
diff options
context:
space:
mode:
authorAndrew Scull <ascull@google.com>2020-06-25 14:14:12 +0100
committerMarc Zyngier <maz@kernel.org>2020-07-05 18:38:12 +0100
commit208243c752a7eeef4236f7b7d67e806ee356e3f8 (patch)
tree23b25b8d4a3fb7d395c2f9a9d39554495e641765 /arch/arm64/kvm/Makefile
parentb877e9849d41e7d2100d2933e0a3971d0ddec011 (diff)
KVM: arm64: Move hyp-init.S to nVHE
hyp-init.S contains the identity mapped initialisation code for the non-VHE code that runs at EL2. It is only used for non-VHE. Adjust code that calls into this to use the prefixed symbol name. Signed-off-by: Andrew Scull <ascull@google.com> Signed-off-by: David Brazdil <dbrazdil@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200625131420.71444-8-dbrazdil@google.com
Diffstat (limited to 'arch/arm64/kvm/Makefile')
-rw-r--r--arch/arm64/kvm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile
index 8d3d9513cbfe..152d8845a1a2 100644
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_KVM) += hyp/
kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
$(KVM)/vfio.o $(KVM)/irqchip.o \
arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \
- inject_fault.o regmap.o va_layout.o hyp.o hyp-init.o handle_exit.o \
+ inject_fault.o regmap.o va_layout.o hyp.o handle_exit.o \
guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o \
vgic-sys-reg-v3.o fpsimd.o pmu.o \
aarch32.o arch_timer.o \