diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2014-04-22 18:03:59 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2015-01-22 15:52:24 +0100 |
| commit | 874d70ed001af95006fe0fd65593de9869011eb3 (patch) | |
| tree | 61d09b9b00c0fb00b68729a975fdd226bd1f8713 /hurd | |
| parent | 553e8d9ba74958024ee6be8769bf5d782f7a6684 (diff) | |
Missing merge fix
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurd/signal.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 8d63d2d0c0..0015a16e55 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -216,15 +216,9 @@ _hurd_critical_section_lock (void) /* The thread variable is unset; this must be the first time we've asked for it. In this case, the critical section flag cannot possible already be set. Look up our sigstate structure the slow -<<<<<<< HEAD way. */ - ss = THREAD_SELF->_hurd_sigstate = _hurd_thread_sigstate (self); + ss = *location = _hurd_thread_sigstate (self); __mach_port_deallocate (__mach_task_self (), self); -======= - way; this locks the sigstate lock. */ - ss = *location = _hurd_thread_sigstate (__mach_thread_self ()); - __spin_unlock (&ss->lock); ->>>>>>> t/tls-threadvar } if (! __spin_try_lock (&ss->critical_section_lock)) |