diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-03-23 14:30:32 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-03-23 14:30:32 +0300 |
| commit | 6232cfd0fa01fe392df0b18a3a06628f130b83b2 (patch) | |
| tree | 468aeeedd2aed27b2d721a72b7da071ef29ace1e /arch/arm/kvm/init.S | |
| parent | ce47fbb7c8956742a6de06b9706b1c6236339f51 (diff) | |
| parent | e60a1fec44a2fe2c85ac406a5c1161ca2957a4fa (diff) | |
| download | linux-6232cfd0fa01fe392df0b18a3a06628f130b83b2.tar.xz | |
Merge branch 'aarch64/kvm-bounce-page' into aarch64/for-next/core
Rework of the KVM HYP bounce page from Ard Biesheuvel. Subsequent arm64
idmap rework depends on this, so merge it here with Marc Zyngier's
blessing (kvm-arm co-maintainer).
Diffstat (limited to 'arch/arm/kvm/init.S')
| -rw-r--r-- | arch/arm/kvm/init.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S index 3988e72d16ff..11fb1d56f449 100644 --- a/arch/arm/kvm/init.S +++ b/arch/arm/kvm/init.S @@ -157,3 +157,6 @@ target: @ We're now in the trampoline code, switch page tables __kvm_hyp_init_end: .popsection + + .global __hyp_idmap_size + .set __hyp_idmap_size, __kvm_hyp_init_end - __kvm_hyp_init |