From a30fb2df74710413014897f527bb565caf7cab9f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 8 Aug 2003 07:11:21 +0000 Subject: Update. 2003-08-06 Jakub Jelinek * tst-cancel17.c (do_test): Make len2 maximum of page size and PIPE_BUF. --- nptl/ChangeLog | 5 +++++ nptl/tst-cancel17.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index dbd9f04dec..3fd2f22f4d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2003-08-06 Jakub Jelinek + + * tst-cancel17.c (do_test): Make len2 maximum of page size and + PIPE_BUF. + 2003-08-07 Jakub Jelinek * pthread_create.c (__pthread_create_2_0): Clear new_attr.cpuset. diff --git a/nptl/tst-cancel17.c b/nptl/tst-cancel17.c index d1734a2e5f..9fb089ac83 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) { -- cgit 1.4.1