leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/mm: define an empty slice_init_new_context_exec()

Browse Source 
Define slice_init_new_context_exec() at all time to avoid

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2018-12-10 12:23:05 +00:00 committed by Michael Ellerman
parent 05a4ab8239
commit badb9687ce
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/include/asm/slice.h
View File

@ -10,6 +10,10 @@
#include <asm/nohash/32/slice.h> #include <asm/nohash/32/slice.h>
#endif #endif
#ifndef __ASSEMBLY__
struct mm_struct;
#ifdef CONFIG_PPC_MM_SLICES #ifdef CONFIG_PPC_MM_SLICES
#ifdef CONFIG_HUGETLB_PAGE #ifdef CONFIG_HUGETLB_PAGE
@ -18,10 +22,6 @@
#define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA
#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
#ifndef __ASSEMBLY__
struct mm_struct;
unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
unsigned long flags, unsigned int psize, unsigned long flags, unsigned int psize,
int topdown); int topdown);
@ -34,8 +34,12 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
void slice_init_new_context_exec(struct mm_struct *mm); void slice_init_new_context_exec(struct mm_struct *mm);
void slice_setup_new_exec(void); void slice_setup_new_exec(void);
#endif /* __ASSEMBLY__ */ #else /* CONFIG_PPC_MM_SLICES */
static inline void slice_init_new_context_exec(struct mm_struct *mm) {}
#endif /* CONFIG_PPC_MM_SLICES */ #endif /* CONFIG_PPC_MM_SLICES */
#endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_SLICE_H */ #endif /* _ASM_POWERPC_SLICE_H */

2
arch/powerpc/mm/mmu_context_nohash.c
View File

@ -372,7 +372,6 @@ int init_new_context(struct task_struct *t, struct mm_struct *mm)
{ {
pr_hard("initing context for mm @%p\n", mm); pr_hard("initing context for mm @%p\n", mm);
#ifdef CONFIG_PPC_MM_SLICES
/* /*
* We have MMU_NO_CONTEXT set to be ~0. Hence check * We have MMU_NO_CONTEXT set to be ~0. Hence check
* explicitly against context.id == 0. This ensures that we properly * explicitly against context.id == 0. This ensures that we properly
@ -382,7 +381,6 @@ int init_new_context(struct task_struct *t, struct mm_struct *mm)
*/ */
if (mm->context.id == 0) if (mm->context.id == 0)
slice_init_new_context_exec(mm); slice_init_new_context_exec(mm);
#endif
mm->context.id = MMU_NO_CONTEXT; mm->context.id = MMU_NO_CONTEXT;
mm->context.active = 0; mm->context.active = 0;
pte_frag_set(&mm->context, NULL); pte_frag_set(&mm->context, NULL);