lkml.org 
[lkml]   [2020]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -next] powerpc/book3s64: fix link error with CONFIG_PPC_RADIX_MMU=n
    Date
    Fix link error when CONFIG_PPC_RADIX_MMU is disabled:
    powerpc64-linux-gnu-ld: arch/powerpc/platforms/pseries/lpar.o:(.toc+0x0): undefined reference to `mmu_pid_bits'

    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    ---
    arch/powerpc/mm/book3s64/mmu_context.c | 4 ++++
    arch/powerpc/platforms/pseries/lpar.c | 2 ++
    2 files changed, 6 insertions(+)

    diff --git a/arch/powerpc/mm/book3s64/mmu_context.c b/arch/powerpc/mm/book3s64/mmu_context.c
    index 0ba30b8b935b..a8e292cd88f0 100644
    --- a/arch/powerpc/mm/book3s64/mmu_context.c
    +++ b/arch/powerpc/mm/book3s64/mmu_context.c
    @@ -152,6 +152,7 @@ void hash__setup_new_exec(void)

    static int radix__init_new_context(struct mm_struct *mm)
    {
    +#ifdef CONFIG_PPC_RADIX_MMU
    unsigned long rts_field;
    int index, max_id;

    @@ -177,6 +178,9 @@ static int radix__init_new_context(struct mm_struct *mm)
    mm->context.hash_context = NULL;

    return index;
    +#else
    + return -ENOTSUPP;
    +#endif
    }

    int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
    diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
    index baf24eacd268..e454e218dbba 100644
    --- a/arch/powerpc/platforms/pseries/lpar.c
    +++ b/arch/powerpc/platforms/pseries/lpar.c
    @@ -1726,10 +1726,12 @@ void __init hpte_init_pseries(void)

    void radix_init_pseries(void)
    {
    +#ifdef CONFIG_PPC_RADIX_MMU
    pr_info("Using radix MMU under hypervisor\n");

    pseries_lpar_register_process_table(__pa(process_tb),
    0, PRTB_SIZE_SHIFT - 12);
    +#endif
    }

    #ifdef CONFIG_PPC_SMLPAR
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-05 13:28    [W:6.195 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site