From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 18 Sep 2004 21:21:36 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ab1fa6fb741caf552f2f1d79467d2455655d02b;p=thirdparty%2Fglibc.git

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 6cd9b0dbd8b..db3aeba3f77 100644
--- 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 6dd2621d993..cbdd781eeb5 100644
--- 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;
 	    }