lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/24] sh: use asm-generic/mmu_context.h for no-op implementations
    Date
    Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
    Cc: Rich Felker <dalias@libc.org>
    Cc: linux-sh@vger.kernel.org
    Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
    ---
    arch/sh/include/asm/mmu_context.h | 5 ++---
    arch/sh/include/asm/mmu_context_32.h | 9 ---------
    2 files changed, 2 insertions(+), 12 deletions(-)

    diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
    index 9470d17c71c2..ce40147d4a7d 100644
    --- a/arch/sh/include/asm/mmu_context.h
    +++ b/arch/sh/include/asm/mmu_context.h
    @@ -85,6 +85,7 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)
    * Initialize the context related info for a new mm_struct
    * instance.
    */
    +#define init_new_context init_new_context
    static inline int init_new_context(struct task_struct *tsk,
    struct mm_struct *mm)
    {
    @@ -121,9 +122,7 @@ static inline void switch_mm(struct mm_struct *prev,
    activate_context(next, cpu);
    }

    -#define activate_mm(prev, next) switch_mm((prev),(next),NULL)
    -#define deactivate_mm(tsk,mm) do { } while (0)
    -#define enter_lazy_tlb(mm,tsk) do { } while (0)
    +#include <asm-generic/mmu_context.h>

    #else

    diff --git a/arch/sh/include/asm/mmu_context_32.h b/arch/sh/include/asm/mmu_context_32.h
    index 71bf12ef1f65..bc5034fa6249 100644
    --- a/arch/sh/include/asm/mmu_context_32.h
    +++ b/arch/sh/include/asm/mmu_context_32.h
    @@ -2,15 +2,6 @@
    #ifndef __ASM_SH_MMU_CONTEXT_32_H
    #define __ASM_SH_MMU_CONTEXT_32_H

    -/*
    - * Destroy context related info for an mm_struct that is about
    - * to be put to rest.
    - */
    -static inline void destroy_context(struct mm_struct *mm)
    -{
    - /* Do nothing */
    -}
    -
    #ifdef CONFIG_CPU_HAS_PTEAEX
    static inline void set_asid(unsigned long asid)
    {
    --
    2.23.0
    \
     
     \ /
      Last update: 2020-07-28 05:36    [W:4.165 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site