diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-20 09:23:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-20 09:23:28 +0100 |
| commit | 0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch) | |
| tree | 75aa590c636feed7d110c03eddb56cc518fc034c /arch/mips/mm/cache.c | |
| parent | 0a2a18b721abc960fbcada406746877d22340a60 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'arch/mips/mm/cache.c')
| -rw-r--r-- | arch/mips/mm/cache.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 1eb7c71e3d6..98ad0a82c29 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -182,6 +182,12 @@ void __devinit cpu_cache_init(void) tx39_cache_init(); } + if (cpu_has_octeon_cache) { + extern void __weak octeon_cache_init(void); + + octeon_cache_init(); + } + setup_protection_map(); } |