diff options
| author | Mike Rapoport <rppt@linux.ibm.com> | 2019-11-05 16:33:19 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2019-11-26 11:33:39 -0800 |
| commit | f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7 (patch) | |
| tree | d7d8ecd9e6c38a6f52680888b1453a74b72a5823 /arch/xtensa/mm/kasan_init.c | |
| parent | 8951eb1530ddf83dbb815d38e97afddc6a0d1140 (diff) | |
| download | linux-stable-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.tar.gz linux-stable-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.tar.bz2 linux-stable-f0d1eab8c2e1f9240cf4ae4753d7947c65e60bd7.zip | |
xtensa: mm: fix PMD folding implementation
There was a definition of pmd_offset() in arch/xtensa/include/asm/pgtable.h
that shadowed the generic implementation defined in
include/asm-generic/pgtable-nopmd.h.
As the result, xtensa had shortcuts in page table traversal in several
places instead of doing level unfolding.
Remove local override for pmd_offset() and add page table unfolding where
necessary.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Message-Id: <1572964400-16542-2-git-send-email-rppt@kernel.org>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/mm/kasan_init.c')
| -rw-r--r-- | arch/xtensa/mm/kasan_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c index af7152560bc3..ace98bdf5191 100644 --- a/arch/xtensa/mm/kasan_init.c +++ b/arch/xtensa/mm/kasan_init.c @@ -20,7 +20,8 @@ void __init kasan_early_init(void) { unsigned long vaddr = KASAN_SHADOW_START; pgd_t *pgd = pgd_offset_k(vaddr); - pmd_t *pmd = pmd_offset(pgd, vaddr); + pud_t *pud = pud_offset(pgd, vaddr); + pmd_t *pmd = pmd_offset(pud, vaddr); int i; for (i = 0; i < PTRS_PER_PTE; ++i) @@ -42,7 +43,8 @@ static void __init populate(void *start, void *end) unsigned long i, j; unsigned long vaddr = (unsigned long)start; pgd_t *pgd = pgd_offset_k(vaddr); - pmd_t *pmd = pmd_offset(pgd, vaddr); + pud_t *pud = pud_offset(pgd, vaddr); + pmd_t *pmd = pmd_offset(pud, vaddr); pte_t *pte = memblock_alloc(n_pages * sizeof(pte_t), PAGE_SIZE); if (!pte) |