Merge branch 't/tls' into refs/top-bases/tschwinge/Roger_Whittaker

Conflicts:
	include/errno.h

3 files changed, 3 insertions, 3 deletions

diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c
index 731509d8fd..1a587dcc8d 100644
--- a/sysdeps/mach/hurd/i386/init-first.c
+++ b/sysdeps/mach/hurd/i386/init-first.c
@@ -194,7 +194,7 @@ init (int *data)
 
   /* We need to setup TLS before starting sigthread */
   extern void __pthread_initialize_minimal(void);
-  __pthread_initialize_minimal();
+  __pthread_initialize_minimal ();
 #endif
 
 
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 0422867b98..dbedeb22a2 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -69,7 +69,7 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 	err = __mach_setup_thread (__mach_task_self (), profile_thread,
 				   &profile_waiter, NULL, NULL);
       if (! err)
-	err = __mach_setup_tls(profile_thread);
+	err = __mach_setup_tls (profile_thread);
     }
   else
     err = 0;
diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c
index f8235d977f..5294b46787 100644
--- a/sysdeps/mach/hurd/setitimer.c
+++ b/sysdeps/mach/hurd/setitimer.c
@@ -230,7 +230,7 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old,
 					 &timer_thread,
 					 &_hurd_itimer_thread_stack_base,
 					 &_hurd_itimer_thread_stack_size))
-	      || (err = __mach_setup_tls(_hurd_itimer_thread)))
+	      || (err = __mach_setup_tls (_hurd_itimer_thread)))
 	    {
 	      __thread_terminate (_hurd_itimer_thread);
 	      _hurd_itimer_thread = MACH_PORT_NULL;