diff --git a/[refs] b/[refs]
index 7cf1c009ee61..13b3244636c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d98f8f05188b45168db43df8ddc9feeb0b1cd512
+refs/heads/master: 3d5631e0631a11633c649bc995a6537ec21b67b4
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index f095178e48c3..507f26e7ae7c 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -556,6 +556,11 @@ void __kprobes unregister_kprobe(struct kprobe *p)
 }
 
 static struct notifier_block kprobe_exceptions_nb = {
+	.notifier_call = kprobe_exceptions_notify,
+	.priority = 0x7fffffff /* we need to be notified first */
+};
+
+static struct notifier_block kprobe_page_fault_nb = {
 	.notifier_call = kprobe_exceptions_notify,
 	.priority = 0x7fffffff /* we need to notified first */
 };
@@ -673,6 +678,9 @@ static int __init init_kprobes(void)
 	if (!err)
 		err = register_die_notifier(&kprobe_exceptions_nb);
 
+	if (!err)
+		err = register_page_fault_notifier(&kprobe_page_fault_nb);
+
 	return err;
 }