Merge tag 'for-f2fs-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[sfrench/cifs-2.6.git] / arch / frv / mm / fault.c

diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 614a46c413d237afdc3a18e03f258785cff9a254..179e79e220e569278e6cb131d96307c5c240c8a7 100644 (file)
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -33,7 +33,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
 {
        struct vm_area_struct *vma;
        struct mm_struct *mm;
-       unsigned long _pme, lrai, lrad, fixup;
+       unsigned long _pme, lrai, lrad;
        unsigned long flags = 0;
        siginfo_t info;
        pgd_t *pge;
@@ -201,10 +201,8 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
 
  no_context:
        /* are we prepared to handle this kernel fault? */
-       if ((fixup = search_exception_table(__frame->pc)) != 0) {
-               __frame->pc = fixup;
+       if (fixup_exception(__frame))
                return;
-       }
 
 /*
  * Oops. The kernel tried to access some bad page. We'll have to