[Glibc-bsd-commits] r6158 - trunk/glibc-ports-2.25/fbtl

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2017-08-04 13:43:21 +0000 (Fri, 04 Aug 2017)
New Revision: 6158

Modified:
   trunk/glibc-ports-2.25/fbtl/nptl-init.c
Log:
Use ALIGN_UP in nptl/nptl-init.c

upstream commit 6d03458e40bdb08d99d05bc7b298b00ad77d8e2b


Modified: trunk/glibc-ports-2.25/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-04 13:35:49 UTC (rev 6157)
+++ trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-04 13:43:21 UTC (rev 6158)
@@ -35,8 +35,8 @@
 #include <smp.h>
 #include <lowlevellock.h>
 #include <kernel-features.h>
+#include <libc-internal.h>
 
-
 /* Size and alignment of static TLS block.  */
 size_t __static_tls_size;
 size_t __static_tls_align_m1;
@@ -426,7 +426,7 @@
     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);