lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 694/879] RISC-V: Fix the XIP build
    Date
    From: Palmer Dabbelt <palmer@rivosinc.com>

    [ Upstream commit d9e418d0ca1c464fe361468b772d4aa870d54e63 ]

    A handful of functions unused functions were enabled during XIP builds,
    which themselves didn't build correctly. This just disables the
    functions entirely.

    Fixes: e8a62cc26ddf ("riscv: Implement sv48 support")
    Reviewed-by: Guo Ren <guoren@kernel.org>
    Link: https://lore.kernel.org/r/20220420184056.7886-5-palmer@rivosinc.com
    Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/riscv/mm/init.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
    index 05ed641a1134..39e2e1d0e94f 100644
    --- a/arch/riscv/mm/init.c
    +++ b/arch/riscv/mm/init.c
    @@ -677,7 +677,7 @@ static __init pgprot_t pgprot_from_va(uintptr_t va)
    }
    #endif /* CONFIG_STRICT_KERNEL_RWX */

    -#ifdef CONFIG_64BIT
    +#if defined(CONFIG_64BIT) && !defined(CONFIG_XIP_KERNEL)
    static void __init disable_pgtable_l5(void)
    {
    pgtable_l5_enabled = false;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 03:46    [W:2.905 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site