powerpc/mm: Call mmu_context_init() from ppc64
Our 64-bit hash context handling has no init function, but 64-bit Book3E will use the common mmu_context_nohash.c code which does, so define an empty inline mmu_context_init() for 64-bit server and call it from our 64-bit setup_arch() Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
d4e167da4c
commit
6f0ef0f505
@ -14,7 +14,6 @@
|
|||||||
/*
|
/*
|
||||||
* Most if the context management is out of line
|
* Most if the context management is out of line
|
||||||
*/
|
*/
|
||||||
extern void mmu_context_init(void);
|
|
||||||
extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
|
extern int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
|
||||||
extern void destroy_context(struct mm_struct *mm);
|
extern void destroy_context(struct mm_struct *mm);
|
||||||
|
|
||||||
@ -23,6 +22,12 @@ extern void switch_stab(struct task_struct *tsk, struct mm_struct *mm);
|
|||||||
extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm);
|
extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm);
|
||||||
extern void set_context(unsigned long id, pgd_t *pgd);
|
extern void set_context(unsigned long id, pgd_t *pgd);
|
||||||
|
|
||||||
|
#ifdef CONFIG_PPC_BOOK3S_64
|
||||||
|
static inline void mmu_context_init(void) { }
|
||||||
|
#else
|
||||||
|
extern void mmu_context_init(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* switch_mm is the entry point called from the architecture independent
|
* switch_mm is the entry point called from the architecture independent
|
||||||
* code in kernel/sched.c
|
* code in kernel/sched.c
|
||||||
|
@ -534,6 +534,10 @@ void __init setup_arch(char **cmdline_p)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
paging_init();
|
paging_init();
|
||||||
|
|
||||||
|
/* Initialize the MMU context management stuff */
|
||||||
|
mmu_context_init();
|
||||||
|
|
||||||
ppc64_boot_msg(0x15, "Setup Done");
|
ppc64_boot_msg(0x15, "Setup Done");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user