Update.

2004-09-18  Ulrich Drepper  <drepper@redhat.com>

	* allocatestack.c (allocate_stack): Return EAGAIN instead of
	ENOMEM when out of memory.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6cd9b0dbd8bde0bec728edce5d4feebef7c671b3..db3aeba3f7790d31caec17b3b0fb3159107ecddd 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-18  Ulrich Drepper  <drepper@redhat.com>
+
+       * allocatestack.c (allocate_stack): Return EAGAIN instead of
+       ENOMEM when out of memory.
+
 2004-09-10  Roland McGrath  <roland@redhat.com>
 
        [BZ #379]

diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 6dd2621d993492fe7f9bd30a2cb9e092704d981b..cbdd781eeb5767b21c2471d12095c1de3f6842ab 100644 (file)
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -366,8 +366,11 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
 
       /* Allocate the DTV for this thread.  */
       if (_dl_allocate_tls (TLS_TPADJ (pd)) == NULL)
-       /* Something went wrong.  */
-       return errno;
+       {
+         /* Something went wrong.  */
+         assert (errno == ENOMEM);
+         return EAGAIN;
+       }
 
 
       /* Prepare to modify global data.  */
@@ -498,12 +501,12 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
          if (_dl_allocate_tls (TLS_TPADJ (pd)) == NULL)
            {
              /* Something went wrong.  */
-             int err = errno;
+             assert (errno == ENOMEM);
 
              /* Free the stack memory we just allocated.  */
              (void) munmap (mem, size);
 
-             return err;
+             return EAGAIN;
            }