aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/mm/tlb-r4k.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-09-28 16:25:52 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-09-28 16:25:52 +0200
commit77a0d763c461da81c2a3fc9a7e58162a40854a1a (patch)
treebc5ca1d08c8f9b98fd8c8726e88788d4fc618118 /arch/mips/mm/tlb-r4k.c
parent8922c9b4b2e3b1b845b46e8da61ad228d8f1b121 (diff)
parent05857c64ecf897209c16ffad9bb3e8d359dd5dca (diff)
Merge branch 'rixi-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
Diffstat (limited to 'arch/mips/mm/tlb-r4k.c')
-rw-r--r--arch/mips/mm/tlb-r4k.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index d2572cb232d..87b9cfcc30f 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -401,7 +401,7 @@ void __cpuinit tlb_init(void)
current_cpu_type() == CPU_R14000)
write_c0_framemask(0);
- if (kernel_uses_smartmips_rixi) {
+ if (cpu_has_rixi) {
/*
* Enable the no read, no exec bits, and enable large virtual
* address.