diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/nptl-init.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 39e70e130c..5c49d7dc72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-11-29 Carlos O'Donell <carlos@redhat.com> + * nptl/nptl-init.c: Include libc-internal.h. + (__pthread_initialize_minimal_internal): Use ROUND_UP. + * elf/ldconfig.c (search_dir): Expand comment. 2014-11-29 Joseph Myers <joseph@codesourcery.com> diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 831d762a70..dcb77c5cf6 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -35,7 +35,7 @@ #include <smp.h> #include <lowlevellock.h> #include <kernel-features.h> - +#include <libc-internal.h> #ifndef TLS_MULTIPLE_THREADS_IN_TCB /* Pointer to the corresponding variable in libc. */ @@ -451,7 +451,7 @@ __pthread_initialize_minimal_internal (void) limit.rlim_cur = minstack; /* Round the resource limit up to page size. */ - limit.rlim_cur = (limit.rlim_cur + pagesz - 1) & -pagesz; + limit.rlim_cur = ALIGN_UP (limit.rlim_cur, pagesz); lll_lock (__default_pthread_attr_lock, LLL_PRIVATE); __default_pthread_attr.stacksize = limit.rlim_cur; __default_pthread_attr.guardsize = GLRO (dl_pagesize); |