Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f2adf1 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: use helper in fault_64.c 



Use the fixup_exception() helper in fault_64.c

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6d48583b

arch/x86/mm/fault_64.c

+1 −4
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, 
	struct mm_struct *mm;

	struct vm_area_struct * vma;

	unsigned long address;

	const struct exception_table_entry *fixup;

	int write, fault;

	unsigned long flags;

	siginfo_t info;
@@ -508,9 +507,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, 
no_context:

	

	/* Are we prepared to handle this kernel fault?  */

	fixup = search_exception_tables(regs->ip);

	if (fixup) {

		regs->ip = fixup->fixup;

	if (fixup_exception(regs)) {

		return;

	}

include/asm-x86/uaccess_64.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ struct exception_table_entry 
	unsigned long insn, fixup;

};



extern int fixup_exception(struct pt_regs *regs);



#define ARCH_HAS_SEARCH_EXTABLE



/*