]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/glibc/glibc-rh751750.patch
Merge remote-tracking branch 'origin/next' into thirteen
[people/teissler/ipfire-2.x.git] / src / patches / glibc / glibc-rh751750.patch
1 commit 7583a88d1c7170caad26966bcea8bfc2c92093ba
2 Author: Andreas Schwab <schwab@redhat.com>
3 Date: Mon Nov 7 15:07:31 2011 +0100
4
5 Fix locking in _IO_flush_all_lockp
6
7 diff --git a/libio/genops.c b/libio/genops.c
8 index 5d21c42..bb40c34 100644
9 --- a/libio/genops.c
10 +++ b/libio/genops.c
11 @@ -826,7 +826,7 @@ _IO_flush_all_lockp (int do_lock)
12 int last_stamp;
13
14 #ifdef _IO_MTSAFE_IO
15 - _IO_cleanup_region_start_noarg (flush_cleanup);
16 + __libc_cleanup_region_start (do_lock, flush_cleanup, 0);
17 if (do_lock)
18 _IO_lock_lock (list_all_lock);
19 #endif
20 @@ -866,7 +866,7 @@ _IO_flush_all_lockp (int do_lock)
21 #ifdef _IO_MTSAFE_IO
22 if (do_lock)
23 _IO_lock_unlock (list_all_lock);
24 - _IO_cleanup_region_end (0);
25 + __libc_cleanup_region_end (0);
26 #endif
27
28 return result;