summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-03-08 21:09:29 +0700
committerJeff Vander Stoep <jeffv@google.com>2016-10-14 12:46:36 -0700
commitd9e3c1d5f7bd8df275f8bce5ed78393c7a5fb22a (patch)
treeefc40f4ff1e9b8e1c413dc0e587956a1f827425c /sound
parent3b41e21ffaa38ff8ed8fa8b71f4410f45f42011f (diff)
UPSTREAM: arm64: account for sparsemem section alignment when choosing vmemmap offset
Commit dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region") fixed an issue where the struct page array would overflow into the adjacent virtual memory region if system RAM was placed so high up in physical memory that its addresses were not representable in the build time configured virtual address size. However, the fix failed to take into account that the vmemmap region needs to be relatively aligned with respect to the sparsemem section size, so that a sequence of page structs corresponding with a sparsemem section in the linear region appears naturally aligned in the vmemmap region. So round up vmemmap to sparsemem section size. Since this essentially moves the projection of the linear region up in memory, also revert the reduction of the size of the vmemmap region. Cc: <stable@vger.kernel.org> Fixes: dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region") Tested-by: Mark Langsdorf <mlangsdo@redhat.com> Tested-by: David Daney <david.daney@cavium.com> Tested-by: Robert Richter <rrichter@cavium.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Bug: 30369029 (cherry picked from commit 36e5cd6b897e17d03008f81e075625d8e43e52d0) Signed-off-by: Jeff Vander Stoep <jeffv@google.com> Change-Id: I77bad8c6a7c1a7c3dda92a37ceef5ddfb196ec70
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions