From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 8 Aug 2003 07:11:21 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~375
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a30fb2df74710413014897f527bb565caf7cab9f;p=thirdparty%2Fglibc.git

Update.

2003-08-06  Jakub Jelinek  <jakub@redhat.com>

	* tst-cancel17.c (do_test): Make len2 maximum of page size and
	PIPE_BUF.
---

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index dbd9f04dec2..3fd2f22f4df 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* tst-cancel17.c (do_test): Make len2 maximum of page size and
+	PIPE_BUF.
+
 2003-08-07  Jakub Jelinek  <jakub@redhat.com>
 
 	* pthread_create.c (__pthread_create_2_0): Clear new_attr.cpuset.
diff --git a/nptl/tst-cancel17.c b/nptl/tst-cancel17.c
index d1734a2e5fc..9fb089ac839 100644
--- a/nptl/tst-cancel17.c
+++ b/nptl/tst-cancel17.c
@@ -226,7 +226,9 @@ do_test (void)
 
   cl_called = 0;
 
-  size_t len2 = fpathconf (fds[1], _PC_PIPE_BUF) + sizeof (mem) + 1;
+  size_t len2 = fpathconf (fds[1], _PC_PIPE_BUF);
+  size_t page_size = sysconf (_SC_PAGESIZE);
+  len2 = (len2 < page_size ? page_size : len2) + sizeof (mem) + 1;
   char *mem2 = malloc (len2);
   if (mem2 == NULL)
     {