Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict

 Conflicts:
	arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 10 insertions, 0 deletions

diff --git a/kernel/fail_function.c b/kernel/fail_function.c
index 21b0122cb39c..1d5632d8bbcc 100644
--- a/kernel/fail_function.c
+++ b/kernel/fail_function.c
@@ -14,6 +14,15 @@
 
 static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs);
 
+static void fei_post_handler(struct kprobe *kp, struct pt_regs *regs,
+                             unsigned long flags)
+{
+        /*
+         * A dummy post handler is required to prohibit optimizing, because
+         * jump optimization does not support execution path overriding.
+         */
+}
+
 struct fei_attr {
         struct list_head list;
         struct kprobe kp;
@@ -56,6 +65,7 @@ static struct fei_attr *fei_attr_new(const char *sym, unsigned long addr)
                         return NULL;
                 }
                 attr->kp.pre_handler = fei_kprobe_handler;
+                attr->kp.post_handler = fei_post_handler;
                 attr->retval = adjust_error_retval(addr, 0);
                 INIT_LIST_HEAD(&attr->list);
         }