diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:54:31 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:54:31 +0000 |
| commit | c7b0250b3ac83f638de22e3428c56b95933c7740 (patch) | |
| tree | ac5aee9a1580445002ef01e6859375a8c679d282 /hurd | |
| parent | 9a47d57c4784163dcf838c7461c53de29ca7a61f (diff) | |
| parent | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (diff) | |
Merge branch 't/tls-threadvar' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurd/signal.h | 2 | ||||
| -rw-r--r-- | hurd/hurdsig.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h index 0acffc5bc3..3bb4c2e886 100644 --- a/hurd/hurd/signal.h +++ b/hurd/hurd/signal.h @@ -210,7 +210,7 @@ _hurd_critical_section_lock (void) struct hurd_sigstate *ss; #ifdef __LIBC_NO_TLS - if (__LIBC_NO_TLS()) + if (__LIBC_NO_TLS ()) /* TLS is currently initializing, no need to enter critical section. */ return NULL; #endif diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index fbc536c9bd..7bc4bc97aa 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -1501,7 +1501,6 @@ _hurdsig_init (const int *intarray, size_t intarraysize) } else { - __cthread_t thread; /* When cthreads is being used, we need to make the signal thread a proper cthread. Otherwise it cannot use mutex_lock et al, which will be the cthreads versions. Various of the message port RPC |