riscv: Fix compilation error with FAST_GUP and rv32
authorAlexandre Ghiti <alexghiti@rivosinc.com>
Mon, 4 Mar 2024 08:02:47 +0000 (09:02 +0100)
committerPalmer Dabbelt <palmer@rivosinc.com>
Fri, 15 Mar 2024 16:27:17 +0000 (09:27 -0700)
By surrounding the definition of pte_leaf_size() with a ifdef napot as
it should have been.

Fixes: e0fe5ab4192c ("riscv: Fix pte_leaf_size() for NAPOT")
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lore.kernel.org/r/20240304080247.387710-1-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/include/asm/pgtable.h

index 89f5f1b..2fdf7c8 100644 (file)
@@ -439,9 +439,11 @@ static inline pte_t pte_mkhuge(pte_t pte)
        return pte;
 }
 
+#ifdef CONFIG_RISCV_ISA_SVNAPOT
 #define pte_leaf_size(pte)     (pte_napot(pte) ?                               \
                                        napot_cont_size(napot_cont_order(pte)) :\
                                        PAGE_SIZE)
+#endif
 
 #ifdef CONFIG_NUMA_BALANCING
 /*