lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 682/917] powerpc: Dont provide __kernel_map_pages() without ARCH_SUPPORTS_DEBUG_PAGEALLOC
    Date
    From: Christophe Leroy <christophe.leroy@csgroup.eu>

    [ Upstream commit f8c0e36b48e32b14bb83332d24e0646acd31d9e9 ]

    When ARCH_SUPPORTS_DEBUG_PAGEALLOC is not selected, the user can
    still select CONFIG_DEBUG_PAGEALLOC in which case __kernel_map_pages()
    is provided by mm/page_poison.c

    So only define __kernel_map_pages() when both
    CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC and CONFIG_DEBUG_PAGEALLOC
    are defined.

    Fixes: 68b44f94d637 ("powerpc/booke: Disable STRICT_KERNEL_RWX, DEBUG_PAGEALLOC and KFENCE")
    Reported-by: kernel test robot <lkp@intel.com>
    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Link: https://lore.kernel.org/r/971b69739ff4746252e711a9845210465c023a9e.1635425947.git.christophe.leroy@csgroup.eu
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/powerpc/mm/pgtable_32.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
    index dcf5ecca19d99..fde1ed445ca46 100644
    --- a/arch/powerpc/mm/pgtable_32.c
    +++ b/arch/powerpc/mm/pgtable_32.c
    @@ -173,7 +173,7 @@ void mark_rodata_ro(void)
    }
    #endif

    -#ifdef CONFIG_DEBUG_PAGEALLOC
    +#if defined(CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC) && defined(CONFIG_DEBUG_PAGEALLOC)
    void __kernel_map_pages(struct page *page, int numpages, int enable)
    {
    unsigned long addr = (unsigned long)page_address(page);
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:34    [W:2.771 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site