aboutsummaryrefslogtreecommitdiffstats
path: root/arch/frv/mm/fault.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-12-25 14:12:18 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-03-28 18:23:32 -0400
commit9a7513cfa26f5fcce15de6130ce3c27d77c0ce55 (patch)
tree1f7769fc94432e965b7e6d19bb0f28ed40254ae5 /arch/frv/mm/fault.c
parentgeneric ...copy_..._user primitives (diff)
downloadlinux-dev-9a7513cfa26f5fcce15de6130ce3c27d77c0ce55.tar.xz
linux-dev-9a7513cfa26f5fcce15de6130ce3c27d77c0ce55.zip
frv: switch to use of fixup_exception()
Massage frv search_exception_table() to a) taking pt_regs pointer as explicit argument b) updating ->pc on success Simplifies callers a bit and allows to convert to generic extable.h, while we are at it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/frv/mm/fault.c')
-rw-r--r--arch/frv/mm/fault.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 614a46c413d2..179e79e220e5 100644
--- 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