diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2013-10-16 18:42:21 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-01-14 13:19:56 -0500 |
commit | c8f3a7dc0102fc9f89cc373c6dd7beb49916a695 (patch) | |
tree | 686b9879c602063a10eb9b9b51e1532f40792a32 | |
parent | 59970753536d98d33efcbe4f119ad8e3e399a46b (diff) |
xtensa: move init_mmu declaration to mmu_context.h
Secondary CPUs need this declaration to initialize their MMUs.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r-- | arch/xtensa/include/asm/mmu_context.h | 6 | ||||
-rw-r--r-- | arch/xtensa/kernel/setup.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/xtensa/include/asm/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h index d43525a286bb..86292c28674f 100644 --- a/arch/xtensa/include/asm/mmu_context.h +++ b/arch/xtensa/include/asm/mmu_context.h | |||
@@ -49,6 +49,12 @@ extern unsigned long asid_cache; | |||
49 | #define ASID_MASK ((1 << XCHAL_MMU_ASID_BITS) - 1) | 49 | #define ASID_MASK ((1 << XCHAL_MMU_ASID_BITS) - 1) |
50 | #define ASID_INSERT(x) (0x03020001 | (((x) & ASID_MASK) << 8)) | 50 | #define ASID_INSERT(x) (0x03020001 | (((x) & ASID_MASK) << 8)) |
51 | 51 | ||
52 | #ifdef CONFIG_MMU | ||
53 | void init_mmu(void); | ||
54 | #else | ||
55 | static inline void init_mmu(void) { } | ||
56 | #endif | ||
57 | |||
52 | static inline void set_rasid_register (unsigned long val) | 58 | static inline void set_rasid_register (unsigned long val) |
53 | { | 59 | { |
54 | __asm__ __volatile__ (" wsr %0, rasid\n\t" | 60 | __asm__ __volatile__ (" wsr %0, rasid\n\t" |
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index 9bc6f0644892..3d353140c2d0 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include <asm/bootparam.h> | 39 | #include <asm/bootparam.h> |
40 | #include <asm/mmu_context.h> | ||
40 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
41 | #include <asm/processor.h> | 42 | #include <asm/processor.h> |
42 | #include <asm/timex.h> | 43 | #include <asm/timex.h> |
@@ -85,12 +86,6 @@ static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; | |||
85 | 86 | ||
86 | sysmem_info_t __initdata sysmem; | 87 | sysmem_info_t __initdata sysmem; |
87 | 88 | ||
88 | #ifdef CONFIG_MMU | ||
89 | extern void init_mmu(void); | ||
90 | #else | ||
91 | static inline void init_mmu(void) { } | ||
92 | #endif | ||
93 | |||
94 | extern int mem_reserve(unsigned long, unsigned long, int); | 89 | extern int mem_reserve(unsigned long, unsigned long, int); |
95 | extern void bootmem_init(void); | 90 | extern void bootmem_init(void); |
96 | extern void zones_init(void); | 91 | extern void zones_init(void); |