diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-02-08 00:06:52 +0100 |
| commit | 189754f96136b0122d286d90de97026e9505fd74 (patch) | |
| tree | 9abfe101717edd79a14a687cc63d747f0b837e8f /mach | |
| parent | cd4e0b15ae15226e9995df7eec2d8a340c55a482 (diff) | |
| parent | db4857c035a52a01f337a8ef6fe70ac08ad66ad5 (diff) | |
Merge branch 't/tls' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
include/errno.h
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/setup-thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mach/setup-thread.c b/mach/setup-thread.c index 198fd0fd3f..f4e3a28a41 100644 --- a/mach/setup-thread.c +++ b/mach/setup-thread.c @@ -93,11 +93,11 @@ __mach_setup_tls (thread_t thread) return error; assert (tssize == MACHINE_THREAD_STATE_COUNT); - tcb = _dl_allocate_tls(NULL); + tcb = _dl_allocate_tls (NULL); if (!tcb) return KERN_RESOURCE_SHORTAGE; - _hurd_tls_new(thread, &ts, tcb); + _hurd_tls_new (thread, &ts, tcb); error = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR, (natural_t *) &ts, tssize); |