From: Nicholas Piggin <npiggin@gmail.com>
To: linux-arch@vger.kernel.org
Cc: Nicholas Piggin <npiggin@gmail.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-m68k@lists.linux-m68k.org
Subject: [PATCH 09/24] m68k: use asm-generic/mmu_context.h for no-op implementations
Date: Tue, 28 Jul 2020 13:33:50 +1000 [thread overview]
Message-ID: <20200728033405.78469-10-npiggin@gmail.com> (raw)
In-Reply-To: <20200728033405.78469-1-npiggin@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/m68k/include/asm/mmu_context.h | 47 +++++------------------------
1 file changed, 8 insertions(+), 39 deletions(-)
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
index cac9f289d1f6..56ae27322178 100644
--- a/arch/m68k/include/asm/mmu_context.h
+++ b/arch/m68k/include/asm/mmu_context.h
@@ -5,10 +5,6 @@
#include <asm-generic/mm_hooks.h>
#include <linux/mm_types.h>
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
#ifdef CONFIG_MMU
#if defined(CONFIG_COLDFIRE)
@@ -58,6 +54,7 @@ static inline void get_mmu_context(struct mm_struct *mm)
/*
* We're finished using the context for an address space.
*/
+#define destroy_context destroy_context
static inline void destroy_context(struct mm_struct *mm)
{
if (mm->context != NO_CONTEXT) {
@@ -79,19 +76,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
set_context(tsk->mm->context, next->pgd);
}
-/*
- * After we have set current->mm to a new value, this activates
- * the context for the new mm so we see the new mappings.
- */
-static inline void activate_mm(struct mm_struct *active_mm,
- struct mm_struct *mm)
-{
- get_mmu_context(mm);
- set_context(mm->context, mm->pgd);
-}
-
-#define deactivate_mm(tsk, mm) do { } while (0)
-
#define prepare_arch_switch(next) load_ksp_mmu(next)
static inline void load_ksp_mmu(struct task_struct *task)
@@ -176,6 +160,7 @@ extern unsigned long get_free_context(struct mm_struct *mm);
extern void clear_context(unsigned long context);
/* set the context for a new task to unmapped */
+#define init_new_context init_new_context
static inline int init_new_context(struct task_struct *tsk,
struct mm_struct *mm)
{
@@ -210,8 +195,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
activate_context(tsk->mm);
}
-#define deactivate_mm(tsk, mm) do { } while (0)
-
+#define activate_mm activate_mm
static inline void activate_mm(struct mm_struct *prev_mm,
struct mm_struct *next_mm)
{
@@ -224,6 +208,7 @@ static inline void activate_mm(struct mm_struct *prev_mm,
#include <asm/page.h>
#include <asm/pgalloc.h>
+#define init_new_context init_new_context
static inline int init_new_context(struct task_struct *tsk,
struct mm_struct *mm)
{
@@ -231,8 +216,6 @@ static inline int init_new_context(struct task_struct *tsk,
return 0;
}
-#define destroy_context(mm) do { } while(0)
-
static inline void switch_mm_0230(struct mm_struct *mm)
{
unsigned long crp[2] = {
@@ -300,8 +283,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, str
}
}
-#define deactivate_mm(tsk,mm) do { } while (0)
-
+#define activate_mm activate_mm
static inline void activate_mm(struct mm_struct *prev_mm,
struct mm_struct *next_mm)
{
@@ -315,24 +297,11 @@ static inline void activate_mm(struct mm_struct *prev_mm,
#endif
-#else /* !CONFIG_MMU */
+#include <asm-generic/mmu_context.h>
-static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
-{
- return 0;
-}
-
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
-{
-}
-
-#define destroy_context(mm) do { } while (0)
-#define deactivate_mm(tsk,mm) do { } while (0)
+#else /* !CONFIG_MMU */
-static inline void activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm)
-{
-}
+#include <asm-generic/nommu_context.h>
#endif /* CONFIG_MMU */
#endif /* __M68K_MMU_CONTEXT_H */
--
2.23.0
next prev parent reply other threads:[~2020-07-28 3:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 3:33 [PATCH 00/24] Use asm-generic for mmu_context no-op functions Nicholas Piggin
2020-07-28 3:33 ` [PATCH 01/24] asm-generic: add generic versions of mmu context functions Nicholas Piggin
2020-07-28 4:01 ` Vineet Gupta
2020-07-28 10:37 ` Nicholas Piggin
2020-08-26 13:59 ` Nicholas Piggin
2020-07-28 5:53 ` kernel test robot
2020-07-28 23:52 ` kernel test robot
2020-07-28 3:33 ` [PATCH 02/24] alpha: use asm-generic/mmu_context.h for no-op implementations Nicholas Piggin
2020-07-28 3:33 ` [PATCH 03/24] arc: " Nicholas Piggin
2020-07-28 3:58 ` Vineet Gupta
2020-07-28 3:33 ` [PATCH 04/24] arm: " Nicholas Piggin
2020-07-28 4:14 ` Vineet Gupta
2020-08-26 14:14 ` Nicholas Piggin
2020-07-28 3:33 ` [PATCH 05/24] arm64: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 06/24] csky: " Nicholas Piggin
2020-07-28 4:09 ` Guo Ren
2020-07-28 3:33 ` [PATCH 07/24] hexagon: " Nicholas Piggin
2020-08-11 18:34 ` Brian Cain
2020-07-28 3:33 ` [PATCH 08/24] ia64: " Nicholas Piggin
2020-07-28 3:33 ` Nicholas Piggin [this message]
2020-07-30 8:11 ` [PATCH 09/24] m68k: " kernel test robot
2020-07-28 3:33 ` [PATCH 10/24] microblaze: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 11/24] mips: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 12/24] nds32: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 13/24] nios2: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 14/24] openrisc: " Nicholas Piggin
2020-07-29 11:45 ` Stafford Horne
2020-08-26 14:33 ` Nicholas Piggin
2020-07-28 3:33 ` [PATCH 15/24] parisc: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 16/24] powerpc: " Nicholas Piggin
2020-07-28 3:33 ` [PATCH 17/24] riscv: " Nicholas Piggin
2020-07-30 21:20 ` Palmer Dabbelt
2020-07-28 3:33 ` [PATCH 18/24] s390: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 19/24] sh: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 20/24] sparc: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 21/24] um: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 22/24] unicore32: " Nicholas Piggin
2020-07-28 3:34 ` [PATCH 23/24] x86: " Nicholas Piggin
2020-07-28 10:54 ` peterz
2020-07-28 3:34 ` [PATCH 24/24] xtensa: " Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728033405.78469-10-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).