diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-14 12:53:03 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-05-09 11:22:01 +0200 |
| commit | 888d9a0146b4b8364e065ab359eae5b3db5badb9 (patch) | |
| tree | 0700667206d0ebbc445f6fbc05e2b908cad11f79 | |
| parent | 927170dd59787d9443e07eeb0b22329c4eff1530 (diff) | |
| download | glibc-888d9a0146b4b8364e065ab359eae5b3db5badb9.tar.gz glibc-888d9a0146b4b8364e065ab359eae5b3db5badb9.tar.xz glibc-888d9a0146b4b8364e065ab359eae5b3db5badb9.zip | |
malloc: Add missing internal_function attributes on function definitions
Fixes build on i386 after commit 29d794863cd6e03115d3670707cc873a9965ba92. (cherry picked from commit 186fe877f3df0b84d57dfbf0386f6332c6aa69bc)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/arena.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c36fca4b22..85a0733097 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-04-14 Florian Weimer <fweimer@redhat.com> + * malloc/arena.c (__malloc_fork_lock_parent) + (__malloc_fork_unlock_parent, __malloc_fork_unlock_child): Add + internal_function attribute. + +2016-04-14 Florian Weimer <fweimer@redhat.com> + Remove malloc hooks from fork handler. They are no longer needed because malloc runs right before fork, and no malloc calls from other fork handlers are not possible anymore. diff --git a/malloc/arena.c b/malloc/arena.c index 1c70b3516d..47715b618a 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -139,6 +139,7 @@ int __malloc_initialized = -1; subsystem. */ void +internal_function __malloc_fork_lock_parent (void) { if (__malloc_initialized < 1) @@ -159,6 +160,7 @@ __malloc_fork_lock_parent (void) } void +internal_function __malloc_fork_unlock_parent (void) { if (__malloc_initialized < 1) @@ -175,6 +177,7 @@ __malloc_fork_unlock_parent (void) } void +internal_function __malloc_fork_unlock_child (void) { if (__malloc_initialized < 1) |