Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db023ea5 authored Sep 14, 2012 by Oleg Nesterov

uprobes: Move clear_thread_flag(TIF_UPROBE) to uprobe_notify_resume()



Move clear_thread_flag(TIF_UPROBE) from do_notify_resume() to
uprobe_notify_resume() for !CONFIG_UPROBES case.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

parent 1b08e907

arch/x86/kernel/signal.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -785,10 +785,8 @@ do_notify_resume(struct pt_regs regs, void unused, __u32 thread_info_flags)
	mce_notify_process();		mce_notify_process();
	#endif /* CONFIG_X86_64 && CONFIG_X86_MCE */		#endif /* CONFIG_X86_64 && CONFIG_X86_MCE */

	if (thread_info_flags & _TIF_UPROBE) {		if (thread_info_flags & _TIF_UPROBE)
	clear_thread_flag(TIF_UPROBE);
	uprobe_notify_resume(regs);		uprobe_notify_resume(regs);
	}

	/* deal with pending signal delivery */		/* deal with pending signal delivery */
	if (thread_info_flags & _TIF_SIGPENDING)		if (thread_info_flags & _TIF_SIGPENDING)

kernel/events/uprobes.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1558,6 +1558,8 @@ void uprobe_notify_resume(struct pt_regs *regs)
	{		{
	struct uprobe_task *utask;		struct uprobe_task *utask;

			clear_thread_flag(TIF_UPROBE);

	utask = current->utask;		utask = current->utask;
	if (utask && utask->active_uprobe)		if (utask && utask->active_uprobe)
	handle_singlestep(utask, regs);		handle_singlestep(utask, regs);