diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2014-09-22 05:31:48 +0400 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-21 13:28:44 +0400 |
| commit | c9d09bbec45fdeb26eed4cec6394bc6fae01ec0d (patch) | |
| tree | af8a277155df468549f8dae9f65ddf0d4d5d8810 | |
| parent | 3ce2ce1c0d79477c8e093e675f38451105798def (diff) | |
| download | linux-c9d09bbec45fdeb26eed4cec6394bc6fae01ec0d.tar.bz2 | |
xtensa: nommu: move init_mmu stub to nommu_context.h
mmu_context.h is not used in nommu configuration, nommu_context.h is
used instead.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/include/asm/mmu_context.h | 4 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/nommu_context.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h index d33c71a8c9ec..04c8ebdc4517 100644 --- a/arch/xtensa/include/asm/mmu_context.h +++ b/arch/xtensa/include/asm/mmu_context.h @@ -50,11 +50,7 @@ DECLARE_PER_CPU(unsigned long, asid_cache); #define ASID_MASK ((1 << XCHAL_MMU_ASID_BITS) - 1) #define ASID_INSERT(x) (0x03020001 | (((x) & ASID_MASK) << 8)) -#ifdef CONFIG_MMU void init_mmu(void); -#else -static inline void init_mmu(void) { } -#endif static inline void set_rasid_register (unsigned long val) { diff --git a/arch/xtensa/include/asm/nommu_context.h b/arch/xtensa/include/asm/nommu_context.h index 3407cf7989b7..22984fd1d846 100644 --- a/arch/xtensa/include/asm/nommu_context.h +++ b/arch/xtensa/include/asm/nommu_context.h @@ -1,3 +1,7 @@ +static inline void init_mmu(void) +{ +} + static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { } |