aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorWill Deacon2015-03-27 12:22:50 +0000
committerWill Deacon2015-03-27 12:22:50 +0000
commit849176c96dab827548176e851525bd1c3fff5a6a (patch)
tree9bc0528b11290bb3bbfd0e1bbc1c55a646937374 /arch/arm/kvm
parent24deabf1b29a72ec7cb8e4f5e8151d60f0066467 (diff)
parenta9fea8b388ed5838fe0744970e67f7019d420824 (diff)
Merge branch 'aarch64/kvm-bounce-page' into aarch64/for-next/core
Just as we thought we'd fixed this, another old linker reared its ugly head trying to build linux-next. Unfortunately, it's the linker binary provided on kernel.org, so give up trying to be clever and align the hyp page to 4k.
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r--arch/arm/kvm/init.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index 11fb1d56f449..3988e72d16ff 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -157,6 +157,3 @@ 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