* Oleg Nesterov <o...@redhat.com> [2012-09-14 19:16:03]:
> Move clear_thread_flag(TIF_UPROBE) from do_notify_resume() to
> uprobe_notify_resume() for !CONFIG_UPROBES case.
>
> Signed-off-by: Oleg Nesterov <o...@redhat.com>
Acked-by: Srikar Dronamraju <sri...@linux.vnet.ibm.com>
> ---
> arch/x86/kernel/signal.c | 4 +---
> kernel/events/uprobes.c | 2 ++
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
> index b280908..0041e5a 100644
> --- a/arch/x86/kernel/signal.c
> +++ b/arch/x86/kernel/signal.c
> @@ -785,10 +785,8 @@ do_notify_resume(struct pt_regs *regs, void *unused,
> __u32 thread_info_flags)
> mce_notify_process();
> #endif /* CONFIG_X86_64 && CONFIG_X86_MCE */
>
> - if (thread_info_flags & _TIF_UPROBE) {
> - clear_thread_flag(TIF_UPROBE);
> + if (thread_info_flags & _TIF_UPROBE)
> uprobe_notify_resume(regs);
> - }
>
> /* deal with pending signal delivery */
> if (thread_info_flags & _TIF_SIGPENDING)
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 4ea0f0b..14c2e99 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -1558,6 +1558,8 @@ void uprobe_notify_resume(struct pt_regs *regs)
> {
> struct uprobe_task *utask;
>
> + clear_thread_flag(TIF_UPROBE);
> +
> utask = current->utask;
> if (utask && utask->active_uprobe)
> handle_singlestep(utask, regs);
> --
> 1.5.5.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
