Re: [PATCH] riscv: Fix compilation error with FAST_GUP and rv32

Palmer Dabbelt
2024-03-15T17:13:43Z

On Mon, 04 Mar 2024 08:47:43 PST (-0800), rdunlap@infradead.org wrote:
>
>
> On 3/4/24 00:02, Alexandre Ghiti wrote:
>> 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

Sorry for being slow here, I just realized this was a result of a
fixes/for-next semantic conflict. So I've merged this (on top of the
broken series) into for-next, but I'm going to hold off on sending
Linus a PR in order to let it get through the testers.

> Thanks.
>
>> ---
>> arch/riscv/include/asm/pgtable.h | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
>> index 25ca14f6942c..54d26a07fa63 100644
>> --- a/arch/riscv/include/asm/pgtable.h
>> +++ b/arch/riscv/include/asm/pgtable.h
>> @@ -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
>> /*