Merge branch 'next-geoip' into core-90-geoip

[ipfire-2.x.git] / src / patches / glibc / glibc-rh751750.patch

commit 7583a88d1c7170caad26966bcea8bfc2c92093ba
Author: Andreas Schwab <schwab@redhat.com>
Date:   Mon Nov 7 15:07:31 2011 +0100

    Fix locking in _IO_flush_all_lockp

diff --git a/libio/genops.c b/libio/genops.c
index 5d21c42..bb40c34 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -826,7 +826,7 @@ _IO_flush_all_lockp (int do_lock)
   int last_stamp;
 
 #ifdef _IO_MTSAFE_IO
-  _IO_cleanup_region_start_noarg (flush_cleanup);
+  __libc_cleanup_region_start (do_lock, flush_cleanup, 0);
   if (do_lock)
     _IO_lock_lock (list_all_lock);
 #endif
@@ -866,7 +866,7 @@ _IO_flush_all_lockp (int do_lock)
 #ifdef _IO_MTSAFE_IO
   if (do_lock)
     _IO_lock_unlock (list_all_lock);
-  _IO_cleanup_region_end (0);
+  __libc_cleanup_region_end (0);
 #endif
 
   return result;