Merge branch 'rcu/urgent' of...

Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu

 into core/urgent

Pull syscall tracing fix from Paul E. McKenney.

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

parents 59fa6245 2c5594df

arch/x86/kernel/ptrace.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1511,6 +1511,13 @@ void syscall_trace_leave(struct pt_regs *regs)
		{
		bool step;

		/*
		* We may come here right after calling schedule_user()
		* or do_notify_resume(), in which case we can be in RCU
		* user mode.
		*/
		rcu_user_exit();

		audit_syscall_exit(regs);

		if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))