Skip to content

Commit

Permalink
xtensa: use asm-generic/mmu_context.h for no-op implementations
Browse files Browse the repository at this point in the history
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Nicholas Piggin authored and Arnd Bergmann committed Oct 27, 2020
1 parent 586c4f2 commit 0a1c8e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 33 deletions.
11 changes: 3 additions & 8 deletions arch/xtensa/include/asm/mmu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ static inline void activate_context(struct mm_struct *mm, unsigned int cpu)
* to -1 says the process has never run on any core.
*/

#define init_new_context init_new_context
static inline int init_new_context(struct task_struct *tsk,
struct mm_struct *mm)
{
Expand All @@ -136,24 +137,18 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
activate_context(next, cpu);
}

#define activate_mm(prev, next) switch_mm((prev), (next), NULL)
#define deactivate_mm(tsk, mm) do { } while (0)

/*
* Destroy context related info for an mm_struct that is about
* to be put to rest.
*/
#define destroy_context destroy_context
static inline void destroy_context(struct mm_struct *mm)
{
invalidate_page_directory();
}


static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
/* Nothing to do. */

}
#include <asm-generic/mmu_context.h>

#endif /* CONFIG_MMU */
#endif /* _XTENSA_MMU_CONTEXT_H */
26 changes: 1 addition & 25 deletions arch/xtensa/include/asm/nommu_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,4 @@ static inline void init_kio(void)
{
}

static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
{
}

static inline int init_new_context(struct task_struct *tsk,struct mm_struct *mm)
{
return 0;
}

static inline void destroy_context(struct mm_struct *mm)
{
}

static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
}

static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
struct task_struct *tsk)
{
}

static inline void deactivate_mm(struct task_struct *tsk, struct mm_struct *mm)
{
}
#include <asm-generic/nommu_context.h>

0 comments on commit 0a1c8e5

Please sign in to comment.