diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index f095178e48c3..507f26e7ae7c 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -556,6 +556,11 @@ valid_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;
 }