---

yaml --- r: 80048 b: refs/heads/master c: 85f2adf h: refs/heads/master v: v3
git-mirror · Jan 30, 2008 · c518896 · c518896
1 parent 0666626
commit c518896
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d48583ba9ade609634e694fc35ea62b7a8adaaa
+refs/heads/master: 85f2adf16955460c98131360f3d76aeb51aba073
diff --git a/trunk/arch/x86/mm/fault_64.c b/trunk/arch/x86/mm/fault_64.c
@@ -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;
 	}
 

diff --git a/trunk/include/asm-x86/uaccess_64.h b/trunk/include/asm-x86/uaccess_64.h
@@ -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
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     /*
@@ Expand Down @@