diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-10-21 18:18:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-10-21 18:18:17 +0200 |
| commit | f38787f4f921222d080d976ef59210ce3c6c6cb4 (patch) | |
| tree | 55e643bc1e5b066f04323a4054fdc814726221be /arch/x86/kernel/signal.c | |
| parent | 957b9095ed296311b36d26e4316d7f637351ac57 (diff) | |
| parent | 71434f2fcba5c22d6e0d51878ba8e241a5dea5fb (diff) | |
| download | op-kernel-dev-f38787f4f921222d080d976ef59210ce3c6c6cb4.zip op-kernel-dev-f38787f4f921222d080d976ef59210ce3c6c6cb4.tar.gz | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/urgent
Pull various uprobes bugfixes from Oleg Nesterov - mostly race and
failure path fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/signal.c')
| -rw-r--r-- | arch/x86/kernel/signal.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 29ad351..70b27ee 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c @@ -824,10 +824,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) |
