---

yaml --- r: 57416 b: refs/heads/master c: e5e3c84 h: refs/heads/master v: v3
git-mirror · Jun 8, 2007 · 062de0d · 062de0d
1 parent ec145e9
commit 062de0d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c52ecdab06ff3b4d0f8914951eb74dc8b049f51c
+refs/heads/master: e5e3c84b70e58fc605635fd340fb8dba3cc59058
diff --git a/trunk/arch/i386/mm/fault.c b/trunk/arch/i386/mm/fault.c
@@ -458,6 +458,11 @@ fastcall void __kprobes do_page_fault(struct pt_regs *regs,
 bad_area_nosemaphore:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & 4) {
+		/*
+		 * It's possible to have interrupts off here.
+		 */
+		local_irq_enable();
+
 		/* 
 		 * Valid to do another page fault here because this one came 
 		 * from user space.

diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
@@ -476,6 +476,12 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 bad_area_nosemaphore:
 	/* User mode accesses just cause a SIGSEGV */
 	if (error_code & PF_USER) {
+
+		/*
+		 * It's possible to have interrupts off here.
+		 */
+		local_irq_enable();
+
 		if (is_prefetch(regs, address, error_code))
 			return;