diff options
| author | David Daney <david.daney@cavium.com> | 2012-05-15 09:04:50 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-05-16 23:34:34 +0200 |
| commit | 6650df3c380e0db558dbfec63ed860402c6afb2a (patch) | |
| tree | e63f022dbb69c5920fd734aecb44cf8c7a225b51 /arch/mips/include/asm/setup.h | |
| parent | MIPS: Use board_cache_error_setup for r4k cache error handler setup. (diff) | |
| download | linux-6650df3c380e0db558dbfec63ed860402c6afb2a.tar.xz linux-6650df3c380e0db558dbfec63ed860402c6afb2a.zip | |
MIPS: Move cache setup to setup_arch().
commit 97ce2c88f9ad42e3c60a9beb9fca87abf3639faa (jump-label: initialize
jump-label subsystem much earlier) breaks MIPS. The jump_label_init()
call was moved before trap_init() which is where we initialize
flush_icache_range().
In order to be good citizens, we move cache initialization earlier so
that we don't jump through a null flush_icache_range function pointer
when doing the jump label initialization.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3822/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/setup.h')
| -rw-r--r-- | arch/mips/include/asm/setup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h index 6dce6d8d09ab..2560b6b6a7d8 100644 --- a/arch/mips/include/asm/setup.h +++ b/arch/mips/include/asm/setup.h @@ -14,7 +14,8 @@ extern void *set_vi_handler(int n, vi_handler_t addr); extern void *set_except_vector(int n, void *addr); extern unsigned long ebase; -extern void per_cpu_trap_init(void); +extern void per_cpu_trap_init(bool); +extern void cpu_cache_init(void); #endif /* __KERNEL__ */ |