diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:32:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-06 19:32:21 -0700 |
| commit | a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e (patch) | |
| tree | 799e60e111e2f5179c7ffd81483abd1d2397003b /arch/mips/mm/tlbex.c | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
| parent | 0011036beeffeada15acd1936d67988de21ca65e (diff) | |
| download | kernel-crypto-a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e.tar.gz kernel-crypto-a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e.tar.xz kernel-crypto-a22a9a90cfbcc91c3e0f8dc8549535e2786d3e7e.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Probe initrd header only if explicitly specified
[MIPS] TX39xx: Add missing local_flush_icache_range initialization
[MIPS] TXx9: Fix txx9_pcode initialization
[MIPS] Fix WARNING: at kernel/smp.c:290
[MIPS] Fix data bus error recovery
Diffstat (limited to 'arch/mips/mm/tlbex.c')
| -rw-r--r-- | arch/mips/mm/tlbex.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 76da73a5ab3..979cf919728 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -1273,10 +1273,10 @@ void __cpuinit build_tlb_refill_handler(void) void __cpuinit flush_tlb_handlers(void) { - flush_icache_range((unsigned long)handle_tlbl, + local_flush_icache_range((unsigned long)handle_tlbl, (unsigned long)handle_tlbl + sizeof(handle_tlbl)); - flush_icache_range((unsigned long)handle_tlbs, + local_flush_icache_range((unsigned long)handle_tlbs, (unsigned long)handle_tlbs + sizeof(handle_tlbs)); - flush_icache_range((unsigned long)handle_tlbm, + local_flush_icache_range((unsigned long)handle_tlbm, (unsigned long)handle_tlbm + sizeof(handle_tlbm)); } |