[PATCH v5 06/25] mm/csky: Use general page fault accounting

[Peter Xu]

Use the general page fault accounting by passing regs into handle_mm_fault().
It naturally solve the issue of multiple page fault accounting when page fault
retry happened.

CC: Guo Ren <guo...@kernel.org>
CC: linux-c...@vger.kernel.org
Acked-by: Guo Ren <guo...@kernel.org>
Signed-off-by: Peter Xu <pet...@redhat.com>
---
 arch/csky/mm/fault.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index 7137e2e8dc57..c3f580714ee4 100644
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -151,7 +151,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long write,
         * the fault.
         */
        fault = handle_mm_fault(vma, address, write ? FAULT_FLAG_WRITE : 0,
-                               NULL);
+                               regs);
        if (unlikely(fault & VM_FAULT_ERROR)) {
                if (fault & VM_FAULT_OOM)
                        goto out_of_memory;
@@ -161,16 +161,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, 
unsigned long write,
                        goto bad_area;
                BUG();
        }
-       if (fault & VM_FAULT_MAJOR) {
-               tsk->maj_flt++;
-               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs,
-                             address);
-       } else {
-               tsk->min_flt++;
-               perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs,
-                             address);
-       }
-
        mmap_read_unlock(mm);
        return;
 
-- 
2.26.2