diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-08 11:57:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-08 11:57:52 +0000 |
| commit | 55a377bc0e2a269b8eed244bc91126e84dc28a8b (patch) | |
| tree | 44f3ff6a3d81ea7f38de8384c5562390eab2b90c /kernel | |
| parent | 3810296c494e846e005add7a8408e3cc070f178b (diff) | |
| parent | 49c42b458929aa5df4f3df028f34f49ceb1388e8 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/uprobes.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 307d87c0991a..1139b228befc 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -1621,7 +1621,6 @@ bool uprobe_deny_signal(void) if (__fatal_signal_pending(t) || arch_uprobe_xol_was_trapped(t)) { utask->state = UTASK_SSTEP_TRAPPED; set_tsk_thread_flag(t, TIF_UPROBE); - set_tsk_thread_flag(t, TIF_NOTIFY_RESUME); } } |