diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 20:12:32 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 20:12:32 +0100 |
| commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
| tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /arch/mips/mm/cache.c | |
| parent | wusb: timeout when waiting for ASL/PZL updates in whci-hcd (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | linux-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.tar.xz linux-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
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 1eb7c71e3d6a..98ad0a82c29e 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(); } |