diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:17 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:31:17 +0000 |
| commit | 4cbfda396f7cd9e83116c28965ade73d80c1cb82 (patch) | |
| tree | f984461fcea407b507789715e64077b15653c277 | |
| parent | 704e05ff173885df6d1d27f381604429f27fd4de (diff) | |
| parent | 064374be911f72dfaec8a75f06da1f9fc1827712 (diff) | |
Merge branch 't/hurdsig-global-dispositions' into refs/top-bases/t/ONSTACK
| -rw-r--r-- | hurd/hurdsig.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 7c1b976220..b28c8c80bf 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -1171,7 +1171,6 @@ post_pending (struct hurd_sigstate *ss, sigset_t pending, void (*reply) (void)) return 1; } -<<<<<<< HEAD /* Post all the pending signals of all threads and return 1. If a traced signal is encountered, abort immediately and return 0. */ static int @@ -1228,7 +1227,6 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, ss = post_signal (ss, signo, detail, untraced, reply); if (! ss) return; -======= /* No pending signals left undelivered for this thread. If we were sent signal 0, we need to check for pending signals for all threads. */ @@ -1278,7 +1276,6 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, __spin_unlock (&ss->lock); } } ->>>>>>> t/tls-threadvar /* The signal was neither fatal nor traced. We still hold SS->lock. */ if (signo != 0 && ss->thread != MACH_PORT_NULL) |