diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:16 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:16 +0000 |
| commit | 149f120edbf89d894bd4e2c83ad7aa55c780d569 (patch) | |
| tree | c18720e7325e8a78871840190935240f6e18f872 /arch/arm64/kvm/arm.c | |
| parent | 37da329ed6a7fd7d5c874ff99b9fc3a18e9c7c64 (diff) | |
| parent | 6ac4a5ac50d1d25a61aa00e660eebb21a2ff9b96 (diff) | |
Merge branch 'kvm-arm64/copro-no-more' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index c0ffb019ca8b..b66d7b4234b1 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -35,7 +35,6 @@ #include <asm/kvm_asm.h> #include <asm/kvm_mmu.h> #include <asm/kvm_emulate.h> -#include <asm/kvm_coproc.h> #include <asm/sections.h> #include <kvm/arm_hypercalls.h> @@ -1541,7 +1540,7 @@ static int init_subsystems(void) goto out; kvm_perf_init(); - kvm_coproc_table_init(); + kvm_sys_reg_table_init(); out: on_each_cpu(_kvm_arch_hardware_disable, NULL, 1); |