diff options
author | Marc Zyngier <maz@kernel.org> | 2020-07-28 17:10:32 +0200 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-07-28 17:10:32 +0200 |
commit | c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc (patch) | |
tree | a419bed04fa4fc0d87cb641daed9e5469627685f /arch/arm64/kvm/Makefile | |
parent | Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP (diff) | |
parent | KVM: arm64: Remove the target table (diff) | |
download | linux-c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc.tar.xz linux-c9dc95005a681cf93c4012f7cc75eaa0ad12bfdc.zip |
Merge branch 'kvm-arm64/target-table-no-more' into kvmarm-master/next-WIP
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/Makefile')
-rw-r--r-- | arch/arm64/kvm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 152d8845a1a2..99977c1972cc 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -14,7 +14,7 @@ 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 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 \ |