From: Marc Zyngier <maz@kernel.org>
Date: Tue, 28 Jul 2020 15:10:32 +0000 (+0100)
Subject: Merge branch 'kvm-arm64/target-table-no-more' into kvmarm-master/next-WIP
X-Git-Tag: v5.9-rc1~47^2~6^2~3
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc

Merge branch 'kvm-arm64/target-table-no-more' into kvmarm-master/next-WIP

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc
diff --cc arch/arm64/kvm/Makefile
index 152d8845a1a2,48cda50aa225..99977c1972cc
--- a/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@@ -13,8 -13,8 +13,8 @@@ 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 \
+ 	 guest.o debug.o reset.o sys_regs.o \
  	 vgic-sys-reg-v3.o fpsimd.o pmu.o \
  	 aarch32.o arch_timer.o \
  	 vgic/vgic.o vgic/vgic-init.o \