diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-27 09:17:13 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-27 09:17:13 -0500 |
| commit | 545f63948d3a2d5ad5aa2245c5cc75d5a45c19b4 (patch) | |
| tree | d8b0f8b4e3b2ebd6824f090bb71a23aa0e84a661 /arch/arm64/kvm/hyp | |
| parent | c2b1209d852fef65dbe13c1eed2c6d7a8cd0d1f8 (diff) | |
| parent | 23bde34771f1ea92fb5e6682c0d8c04304d34b3b (diff) | |
Merge tag 'kvmarm-fixes-5.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/arm64 fixes for v5.10, take #4
- Fix alignment of the new HYP sections
- Fix GICR_TYPER access from userspace
Diffstat (limited to 'arch/arm64/kvm/hyp')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S index bb2d986ff696..a797abace13f 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp.lds.S +++ b/arch/arm64/kvm/hyp/nvhe/hyp.lds.S @@ -13,6 +13,11 @@ SECTIONS { HYP_SECTION(.text) + /* + * .hyp..data..percpu needs to be page aligned to maintain the same + * alignment for when linking into vmlinux. + */ + . = ALIGN(PAGE_SIZE); HYP_SECTION_NAME(.data..percpu) : { PERCPU_INPUT(L1_CACHE_BYTES) } |