| Message ID | 20200826145249.745432-16-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | None | expand |
On 26.08.20 16:52, Nicholas Piggin wrote: > Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> > Cc: Helge Deller <deller@gmx.de> > Cc: linux-parisc@vger.kernel.org > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Acked-by: Helge Deller <deller@gmx.de> > --- > arch/parisc/include/asm/mmu_context.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/parisc/include/asm/mmu_context.h b/arch/parisc/include/asm/mmu_context.h > index cb5f2f730421..46f8c22c5977 100644 > --- a/arch/parisc/include/asm/mmu_context.h > +++ b/arch/parisc/include/asm/mmu_context.h > @@ -7,16 +7,13 @@ > #include <linux/atomic.h> > #include <asm-generic/mm_hooks.h> > > -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) > -{ > -} > - > /* on PA-RISC, we actually have enough contexts to justify an allocator > * for them. prumpf */ > > extern unsigned long alloc_sid(void); > extern void free_sid(unsigned long); > > +#define init_new_context init_new_context > static inline int > init_new_context(struct task_struct *tsk, struct mm_struct *mm) > { > @@ -26,6 +23,7 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) > return 0; > } > > +#define destroy_context destroy_context > static inline void > destroy_context(struct mm_struct *mm) > { > @@ -71,8 +69,7 @@ static inline void switch_mm(struct mm_struct *prev, > } > #define switch_mm_irqs_off switch_mm_irqs_off > > -#define deactivate_mm(tsk,mm) do { } while (0) > - > +#define activate_mm activate_mm > static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) > { > /* > @@ -90,4 +87,7 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) > > switch_mm(prev,next,current); > } > + > +#include <asm-generic/mmu_context.h> > + > #endif >
diff --git a/arch/parisc/include/asm/mmu_context.h b/arch/parisc/include/asm/mmu_context.h index cb5f2f730421..46f8c22c5977 100644 --- a/arch/parisc/include/asm/mmu_context.h +++ b/arch/parisc/include/asm/mmu_context.h @@ -7,16 +7,13 @@ #include <linux/atomic.h> #include <asm-generic/mm_hooks.h> -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) -{ -} - /* on PA-RISC, we actually have enough contexts to justify an allocator * for them. prumpf */ extern unsigned long alloc_sid(void); extern void free_sid(unsigned long); +#define init_new_context init_new_context static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { @@ -26,6 +23,7 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) return 0; } +#define destroy_context destroy_context static inline void destroy_context(struct mm_struct *mm) { @@ -71,8 +69,7 @@ static inline void switch_mm(struct mm_struct *prev, } #define switch_mm_irqs_off switch_mm_irqs_off -#define deactivate_mm(tsk,mm) do { } while (0) - +#define activate_mm activate_mm static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) { /* @@ -90,4 +87,7 @@ static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next) switch_mm(prev,next,current); } + +#include <asm-generic/mmu_context.h> + #endif
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/parisc/include/asm/mmu_context.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)