Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git

# Conflicts:
#	fs/binfmt_elf_fdpic.c

1 files changed, 8 insertions, 0 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 0c5f06d08c35..40073142288f 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1279,6 +1279,14 @@ int begin_new_exec(struct linux_binprm * bprm)
 		return retval;
 
 	/*
+	 * This tracepoint marks the point before flushing the old exec where
+	 * the current task is still unchanged, but errors are fatal (point of
+	 * no return). The later "sched_process_exec" tracepoint is called after
+	 * the current task has successfully switched to the new exec.
+	 */
+	trace_sched_prepare_exec(current, bprm);
+
+	/*
 	 * Ensure all future errors are fatal.
 	 */
 	bprm->point_of_no_return = true;