diff options
| author |   Ralf Baechle <ralf@linux-mips.org> | 2012-09-28 16:25:52 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-09-28 16:25:52 +0200 |
| commit | 77a0d763c461da81c2a3fc9a7e58162a40854a1a (patch) | |
| tree | bc5ca1d08c8f9b98fd8c8726e88788d4fc618118 /arch/mips/mm/fault.c | |
| parent | Merge branch 'broadcom' of git://dev.phrozen.org/mips-next into mips-for-linux-next (diff) | |
| parent | MIPS: Replace 'kernel_uses_smartmips_rixi' with 'cpu_has_rixi'. (diff) | |
| download | wireguard-linux-77a0d763c461da81c2a3fc9a7e58162a40854a1a.tar.xz wireguard-linux-77a0d763c461da81c2a3fc9a7e58162a40854a1a.zip | |
Merge branch 'rixi-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
Diffstat (limited to '')
| -rw-r--r-- | arch/mips/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c index c14f6dfed995..7a19957735e9 100644 --- a/arch/mips/mm/fault.c +++ b/arch/mips/mm/fault.c @@ -114,7 +114,7 @@ good_area: if (!(vma->vm_flags & VM_WRITE)) goto bad_area; } else { - if (kernel_uses_smartmips_rixi) { + if (cpu_has_rixi) { if (address == regs->cp0_epc && !(vma->vm_flags & VM_EXEC)) { #if 0 pr_notice("Cpu%d[%s:%d:%0*lx:%ld:%0*lx] XI violation\n", |