---

yaml
---
r: 131007
b: refs/heads/master
c: 9be260a
h: refs/heads/master
i:
  131005: 105b727
  131003: eeaf4b5
  130999: be4c102
  130991: 69cbf67
  130975: aa60ef0
  130943: 33c0295
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 767b5828ad9a1b435488b5d39b5a66aeef4d25e4
+refs/heads/master: 9be260a646bf76fa418ee519afa10196b3164681

trunk/arch/x86/mm/fault.c

@@ -603,8 +603,6 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 
 	si_code = SEGV_MAPERR;
 
-	if (notify_page_fault(regs))
-		return;
 	if (unlikely(kmmio_fault(regs, address)))
 		return;
 
@@ -634,13 +632,19 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code)
 		if (spurious_fault(address, error_code))
 			return;
 
+		/* kprobes don't want to hook the spurious faults. */
+		if (notify_page_fault(regs))
+			return;
 		/*
 		 * Don't take the mm semaphore here. If we fixup a prefetch
 		 * fault we could otherwise deadlock.
 		 */
 		goto bad_area_nosemaphore;
 	}
 
+	/* kprobes don't want to hook the spurious faults. */
+	if (notify_page_fault(regs))
+		return;
 
 	/*
 	 * It's safe to allow irq's after cr2 has been saved and the