evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MIPS: Use board_cache_error_setup for r4k cache error handler setup.

Browse source 
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3821/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney 2012-05-15 00:04:49 -07:00 • committed by Ralf Baechle
parent 586016ebf7
commit 9cd9669bd6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/mips/mm/c-r4k.c
View file

@ -32,7 +32,7 @@
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/war.h> #include <asm/war.h>
#include <asm/cacheflush.h> /* for run_uncached() */ #include <asm/cacheflush.h> /* for run_uncached() */
#include <asm/traps.h>
/* /*
* Special Variant of smp_call_function for use by cache functions: * Special Variant of smp_call_function for use by cache functions:
@ -1385,10 +1385,8 @@ static int __init setcoherentio(char *str)
__setup("coherentio", setcoherentio); __setup("coherentio", setcoherentio);
#endif #endif
void __cpuinit r4k_cache_init(void) static void __cpuinit r4k_cache_error_setup(void)
{ {
extern void build_clear_page(void);
extern void build_copy_page(void);
extern char __weak except_vec2_generic; extern char __weak except_vec2_generic;
extern char __weak except_vec2_sb1; extern char __weak except_vec2_sb1;
struct cpuinfo_mips *c = &current_cpu_data; struct cpuinfo_mips *c = &current_cpu_data;
@ -1403,6 +1401,13 @@ void __cpuinit r4k_cache_init(void)
set_uncached_handler(0x100, &except_vec2_generic, 0x80); set_uncached_handler(0x100, &except_vec2_generic, 0x80);
break; break;
} }
}
void __cpuinit r4k_cache_init(void)
{
extern void build_clear_page(void);
extern void build_copy_page(void);
struct cpuinfo_mips *c = &current_cpu_data;
probe_pcache(); probe_pcache();
setup_scache(); setup_scache();
@ -1465,4 +1470,5 @@ void __cpuinit r4k_cache_init(void)
local_r4k___flush_cache_all(NULL); local_r4k___flush_cache_all(NULL);
#endif #endif
coherency_setup(); coherency_setup();
board_cache_error_setup = r4k_cache_error_setup;
} }