Merge.
diff --git a/Include/pystate.h b/Include/pystate.h
index 63371fa..8d74940 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -111,7 +111,6 @@
PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
#ifdef WITH_THREAD
PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void);
-PyAPI_FUNC(void) _PyGILState_Reinit(void);
#endif
PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void);
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 6f021e7..f306bba 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -976,7 +976,6 @@
PyOS_AfterFork(void)
{
#ifdef WITH_THREAD
- _PyGILState_Reinit();
PyEval_ReInitThreads();
main_thread = PyThread_get_thread_ident();
main_pid = getpid();
diff --git a/Python/pystate.c b/Python/pystate.c
index 3eefa36..ddb7d42 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -537,23 +537,6 @@
autoInterpreterState = NULL;
}
-/* Reset the TLS key - called by PyOS_AfterFork.
- * This should not be necessary, but some - buggy - pthread implementations
- * don't flush TLS on fork, see issue #10517.
- */
-void
-_PyGILState_Reinit(void)
-{
- PyThreadState *tstate = PyGILState_GetThisThreadState();
- PyThread_delete_key(autoTLSkey);
- if ((autoTLSkey = PyThread_create_key()) == -1)
- Py_FatalError("Could not allocate TLS entry");
-
- /* re-associate the current thread state with the new key */
- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0)
- Py_FatalError("Couldn't create autoTLSkey mapping");
-}
-
/* When a thread state is created for a thread by some mechanism other than
PyGILState_Ensure, it's important that the GILState machinery knows about
it so it doesn't try to create another thread state for the thread (this is