diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2016-06-30 18:40:48 +0100 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-07-03 23:41:27 +0200 |
| commit | e537ecd7efacaa7512e87ecb07c0c0335a902558 (patch) | |
| tree | 8bec094f4c81926ae092bad1214beff82f086fc8 /arch/arm/include/asm/kvm_host.h | |
| parent | cd602a37e80c791adf2a256d2aedec60b898cd51 (diff) | |
| download | blackbird-op-linux-e537ecd7efacaa7512e87ecb07c0c0335a902558.tar.gz blackbird-op-linux-e537ecd7efacaa7512e87ecb07c0c0335a902558.zip | |
arm: KVM: Allow hyp teardown
So far, KVM was getting in the way of kexec on 32bit (and the arm64
kexec hackers couldn't be bothered to fix it on 32bit...).
With simpler page tables, tearing KVM down becomes very easy, so
let's just do it.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index eafbfd5ad34a..58d0b69e7428 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -266,12 +266,10 @@ static inline void __cpu_init_stage2(void) kvm_call_hyp(__init_stage2_translation); } -static inline void __cpu_reset_hyp_mode(phys_addr_t phys_idmap_start) +static inline void __cpu_reset_hyp_mode(unsigned long vector_ptr, + phys_addr_t phys_idmap_start) { - /* - * TODO - * kvm_call_reset(phys_idmap_start); - */ + kvm_call_hyp((void *)virt_to_idmap(__kvm_hyp_reset), vector_ptr); } static inline int kvm_arch_dev_ioctl_check_extension(long ext) |
