openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Oleg Nesterov 2012-09-14 19:05:46 +02:00
parent 1b08e90721
commit db023ea595
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/signal.c
View File

@ -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)

2
kernel/events/uprobes.c
View File

@ -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);