diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-02-12 14:08:18 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-02-12 14:08:18 +0000 |
| commit | e7ae2ecdc8410f52bef5c3e8159c706712ba5ca4 (patch) | |
| tree | 99efaea6124bed610e1d257e30f2992c8374fb6c /arch/arm64/kvm/hyp/nvhe/hyp-init.S | |
| parent | c5db649f3ded34096e84358e27be38931a691d99 (diff) | |
| parent | bc93763f178fd04f484ee3e521bbdae57fddb891 (diff) | |
| download | linux-e7ae2ecdc8410f52bef5c3e8159c706712ba5ca4.tar.bz2 | |
Merge branch 'kvm-arm64/hyp-reloc' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp/nvhe/hyp-init.S')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/hyp-init.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-init.S b/arch/arm64/kvm/hyp/nvhe/hyp-init.S index b3915ccb23b0..3dbc0c649d36 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-init.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S @@ -18,7 +18,7 @@ #include <asm/virt.h> .text - .pushsection .hyp.idmap.text, "ax" + .pushsection .idmap.text, "ax" .align 11 @@ -132,7 +132,6 @@ alternative_else_nop_endif /* Set the host vector */ ldr x0, =__kvm_hyp_host_vector - kimg_hyp_va x0, x1 msr vbar_el2, x0 ret @@ -191,7 +190,6 @@ SYM_CODE_START_LOCAL(__kvm_hyp_init_cpu) /* Leave idmap. */ mov x0, x29 ldr x1, =kvm_host_psci_cpu_entry - kimg_hyp_va x1, x2 br x1 SYM_CODE_END(__kvm_hyp_init_cpu) |