diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-03-22 09:08:40 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-05-02 17:58:11 +0200 |
| commit | 93f2cd813797baf5590459fb0439c62e873b7748 (patch) | |
| tree | 3fbaaf3542d0176008cd494c1b2f951a25fe56d0 /arch/powerpc | |
| parent | powerpc/fadump: define an empty fadump_cleanup() (diff) | |
| download | linux-93f2cd813797baf5590459fb0439c62e873b7748.tar.xz linux-93f2cd813797baf5590459fb0439c62e873b7748.zip | |
powerpc/mm: define an empty mm_iommu_init()
To avoid ifdefs, define a empty static inline mm_iommu_init() function
when CONFIG_SPAPR_TCE_IOMMU is not selected.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/mmu_context.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h index 66a3805dc935..611204e588b9 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h @@ -52,6 +52,7 @@ static inline bool mm_iommu_is_devmem(struct mm_struct *mm, unsigned long hpa, { return false; } +static inline void mm_iommu_init(struct mm_struct *mm) { } #endif extern void switch_slb(struct task_struct *tsk, struct mm_struct *mm); extern void set_context(unsigned long id, pgd_t *pgd); diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 13054980e11a..d06d50fe1e7e 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -931,9 +931,7 @@ void __init setup_arch(char **cmdline_p) init_mm.end_data = (unsigned long) _edata; init_mm.brk = klimit; -#ifdef CONFIG_SPAPR_TCE_IOMMU mm_iommu_init(&init_mm); -#endif irqstack_early_init(); exc_lvl_early_init(); emergency_stack_init(); |