Merge branch 'akpm' (Andrew's patch-bomb)
[linux-3.10.git] / arch / mips / mm / fault.c
index 9f51348..ddcec1e 100644 (file)
@@ -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",