sparc32: fix page table traversal in srmmu_nocache_init()

0cfc8a8d · Mike Rapoport <[email protected]> · 2020-05-23 22:57:18 +03:00

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.

Fixes: c2bc26f7ca1f ("sparc32: use PUD rather than PGD to get PMD in srmmu_nocache_init()")
Signed-off-by: Mike Rapoport <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Anatoly Pugachev <[email protected]>
Cc: <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 0cfc8a8d70dcd51db783e8e87917e02149c71458
Parents: 423b8baf

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
arch/sparc/mm/srmmu.c	modified	+2	−2	View file

arch/sparc/mm/srmmu.c

View file

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index e9f7af3..a8c2f26 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -331,8 +331,8 @@ static void __init srmmu_nocache_init(void)
 
 	while (vaddr < srmmu_nocache_end) {
 		pgd = pgd_offset_k(vaddr);
-		p4d = p4d_offset(__nocache_fix(pgd), vaddr);
-		pud = pud_offset(__nocache_fix(p4d), vaddr);
+		p4d = p4d_offset(pgd, vaddr);
+		pud = pud_offset(p4d, vaddr);
 		pmd = pmd_offset(__nocache_fix(pud), vaddr);
 		pte = pte_offset_kernel(__nocache_fix(pmd), vaddr);
 