History

sparc32: fix page table traversal in srmmu_nocache_init()

The srmmu_nocache_init() uses __nocache_fix() macro to add an offset to page table entry to access srmmu_nocache_pool. But since sparc32 has only three actual page table levels, pgd, p4d and pud are essentially the same thing and pgd_offset() and p4d_offset() are no-ops, the __nocache_fix() should be done only at PUD level. Remove __nocache_fix() for p4d_offset() and pud_offset() and keep it only for PUD and lower levels.

Mike Rapoport committed 6 years ago

Commit 0cfc8a81 parent 423b8ba1 file · +2 −2Browse files

Unified · Split

arch/sparc/mm/srmmu.c+2−2
@@ -331,8 +331,8 @@ static void __init srmmu_nocache_init(void) · 330 unmodified lines
331331
332332 while (vaddr < srmmu_nocache_end) {
333333 pgd = pgd_offset_k(vaddr);
334− p4d = p4d_offset(__nocache_fix(pgd), vaddr);
335− pud = pud_offset(__nocache_fix(p4d), vaddr);
334+ p4d = p4d_offset(pgd, vaddr);
335+ pud = pud_offset(p4d, vaddr);
336336 pmd = pmd_offset(__nocache_fix(pud), vaddr);
337337 pte = pte_offset_kernel(__nocache_fix(pmd), vaddr);
338338