Patched in Tegra support.

1 files changed, 9 insertions, 31 deletions

diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index ddcec1e1a0c..937cf336816 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -22,6 +22,7 @@
 
 #include <asm/branch.h>
 #include <asm/mmu_context.h>
+#include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/ptrace.h>
 #include <asm/highmem.h>                /* For VMALLOC_END */
@@ -41,8 +42,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, unsigned long writ
         const int field = sizeof(unsigned long) * 2;
         siginfo_t info;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                                 (write ? FAULT_FLAG_WRITE : 0);
 
 #if 0
         printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", raw_smp_processor_id(),
@@ -92,7 +91,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, unsigned long writ
         if (in_atomic() || !mm)
                 goto bad_area_nosemaphore;
 
-retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
         if (!vma)
@@ -114,7 +112,7 @@ good_area:
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
         } else {
-                if (cpu_has_rixi) {
+                if (kernel_uses_smartmips_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",
@@ -146,11 +144,7 @@ good_area:
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        fault = handle_mm_fault(mm, vma, address, flags);
-
-        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
-                return;
-
+        fault = handle_mm_fault(mm, vma, address, write ? FAULT_FLAG_WRITE : 0);
         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
@@ -159,28 +153,12 @@ good_area:
                         goto do_sigbus;
                 BUG();
         }
-        if (flags & FAULT_FLAG_ALLOW_RETRY) {
-                if (fault & VM_FAULT_MAJOR) {
-                        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1,
-                                                  regs, address);
-                        tsk->maj_flt++;
-                } else {
-                        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1,
-                                                  regs, address);
-                        tsk->min_flt++;
-                }
-                if (fault & VM_FAULT_RETRY) {
-                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
-                        flags |= FAULT_FLAG_TRIED;
-
-                        /*
-                         * No need to up_read(&mm->mmap_sem) as we would
-                         * have already released it in __lock_page_or_retry
-                         * in mm/filemap.c.
-                         */
-
-                        goto retry;
-                }
+        if (fault & VM_FAULT_MAJOR) {
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address);
+                tsk->maj_flt++;
+        } else {
+                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address);
+                tsk->min_flt++;
         }
 
         up_read(&mm->mmap_sem);