diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
| commit | a4b28f5c67983d92c911ca1404728bc4ea958c0e (patch) | |
| tree | 9e33ce5332ee983a7424fe6146f91f2f4f551a15 /arch/arm/kvm | |
| parent | da345174ceca052469e4775e4ae263b5f27a9355 (diff) | |
| parent | c7892db5dd6afe921ead502aff7440a1e450d947 (diff) | |
| download | linux-a4b28f5c67983d92c911ca1404728bc4ea958c0e.tar.bz2 | |
Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next
Diffstat (limited to 'arch/arm/kvm')
| -rw-r--r-- | arch/arm/kvm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/kvm/handle_exit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kvm/Makefile b/arch/arm/kvm/Makefile index b76b75bd9e00..e442d82821df 100644 --- a/arch/arm/kvm/Makefile +++ b/arch/arm/kvm/Makefile @@ -24,7 +24,7 @@ obj-y += kvm-arm.o init.o interrupts.o obj-y += handle_exit.o guest.o emulate.o reset.o obj-y += coproc.o coproc_a15.o coproc_a7.o vgic-v3-coproc.o obj-y += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o -obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o +obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o $(KVM)/arm/hypercalls.o obj-y += $(KVM)/arm/aarch32.o obj-y += $(KVM)/arm/vgic/vgic.o diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index 2a6a1394d26e..e58a89d2f13f 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -9,7 +9,7 @@ #include <asm/kvm_emulate.h> #include <asm/kvm_coproc.h> #include <asm/kvm_mmu.h> -#include <kvm/arm_psci.h> +#include <kvm/arm_hypercalls.h> #include <trace/events/kvm.h> #include "trace.h" |