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

Conflicts:
	hurd/hurd/signal.h

1 files changed, 1 insertions, 1 deletions

diff --git a/hurd/hurd/signal.h b/hurd/hurd/signal.h
index 8454c69979..d94fb3cbd4 100644
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
@@ -244,7 +244,7 @@ _hurd_critical_section_unlock (void *our_lock)
   else
     {
       /* It was us who acquired the critical section lock.  Unlock it.  */
-      struct hurd_sigstate *ss = (struct hurd_sigstate *) our_lock;
+      struct hurd_sigstate *ss = our_lock;
       sigset_t pending;
       _hurd_sigstate_lock (ss);
       __spin_unlock (&ss->critical_section_lock);