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>,
linux-m68k@lists.linux-m68k.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v3 09/23] m68k: use asm-generic/mmu_context.h for no-op implementations
Date: Wed, 2 Sep 2020 00:15:25 +1000 [thread overview]
Message-ID: <20200901141539.1757549-10-npiggin@gmail.com> (raw)
In-Reply-To: <20200901141539.1757549-1-npiggin@gmail.com>
Cc: linux-m68k@lists.linux-m68k.org
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/m68k/include/asm/mmu_context.h | 37 +++++++----------------------
1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
index 993fd7e37069..d12d8a9032f6 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) {
@@ -83,6 +80,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
* After we have set current->mm to a new value, this activates
* the context for the new mm so we see the new mappings.
*/
+#define activate_mm activate_mm
static inline void activate_mm(struct mm_struct *active_mm,
struct mm_struct *mm)
{
@@ -90,8 +88,6 @@ static inline void activate_mm(struct mm_struct *active_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 +172,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 +207,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 +220,7 @@ static inline void activate_mm(struct mm_struct *prev_mm,
#include <asm/page.h>
#include <asm/cacheflush.h>
+#define init_new_context init_new_context
static inline int init_new_context(struct task_struct *tsk,
struct mm_struct *mm)
{
@@ -231,8 +228,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 +295,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 +309,11 @@ static inline void activate_mm(struct mm_struct *prev_mm,
#endif
-#else /* !CONFIG_MMU */
-
-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)
-{
-}
+#include <asm-generic/mmu_context.h>
-#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-09-01 14:43 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-01 14:15 [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 01/23] asm-generic: add generic MMU versions of mmu context functions Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 02/23] alpha: use asm-generic/mmu_context.h for no-op implementations Nicholas Piggin
2020-09-01 16:51 ` Matt Turner
2020-09-01 16:51 ` Matt Turner
2020-09-01 14:15 ` [PATCH v3 03/23] arc: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 18:32 ` Vineet Gupta
2020-09-01 18:32 ` Vineet Gupta
2020-09-01 18:32 ` Vineet Gupta
2020-09-01 14:15 ` [PATCH v3 04/23] arm: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 05/23] arm64: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 06/23] csky: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 07/23] hexagon: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 08/23] ia64: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin [this message]
2020-09-01 14:15 ` [PATCH v3 10/23] microblaze: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 11/23] mips: " Nicholas Piggin
2020-09-01 15:23 ` Thomas Bogendoerfer
2020-09-01 14:15 ` [PATCH v3 12/23] nds32: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 13/23] nios2: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 14/23] openrisc: " Nicholas Piggin
2020-09-01 14:15 ` [OpenRISC] " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 15/23] parisc: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 16/23] powerpc: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 17/23] riscv: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 18/23] s390: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 19/23] sh: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-03 5:57 ` Rich Felker
2020-09-03 5:57 ` Rich Felker
2020-09-01 14:15 ` [PATCH v3 20/23] sparc: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 21/23] um: " Nicholas Piggin
2020-09-01 14:15 ` Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 22/23] x86: " Nicholas Piggin
2020-09-01 14:15 ` [PATCH v3 23/23] xtensa: " Nicholas Piggin
2020-09-01 17:55 ` Max Filippov
2020-09-01 17:55 ` Max Filippov
2020-09-09 11:27 ` [PATCH v3 00/23] Use asm-generic for mmu_context no-op functions Arnd Bergmann
2020-10-09 14:01 ` Arnd Bergmann
2020-10-09 14:01 ` Arnd Bergmann
2020-10-10 2:02 ` Stephen Rothwell
2020-10-10 8:25 ` Arnd Bergmann
2020-10-10 8:25 ` Arnd Bergmann
2020-10-10 19:00 ` Stephen Rothwell
2020-10-19 1:00 ` 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=20200901141539.1757549-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.