diff options
| author | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-07-29 13:41:25 +0200 |
| commit | ac285df609a4cdd7fe09949bfe0d650a82d9942f (patch) | |
| tree | 4735e2e6ddc539475f3820d4aea955206fc8c077 /posix | |
| parent | 6bdb5f22a0ee205c45d1f465a8b39179830a14cb (diff) | |
| parent | c97164f05ba8fa5d2ebf30f1c2de083bc1ead1e1 (diff) | |
Merge commit 'origin/release/2.10/master' into fedora/2.10/master
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/.cvsignore | 6 | ||||
| -rw-r--r-- | posix/tst-cpucount.c | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/posix/.cvsignore b/posix/.cvsignore deleted file mode 100644 index 3fc9f4cdf1..0000000000 --- a/posix/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* -distinfo diff --git a/posix/tst-cpucount.c b/posix/tst-cpucount.c index fe3cded732..b3691a18da 100644 --- a/posix/tst-cpucount.c +++ b/posix/tst-cpucount.c @@ -1,5 +1,6 @@ #include <sched.h> #include <stdio.h> +#include <sys/param.h> static int do_test (void) @@ -8,7 +9,7 @@ do_test (void) CPU_ZERO (&c); - for (int cnt = 0; cnt < 130; ++cnt) + for (int cnt = 0; cnt < MIN (CPU_SETSIZE, 130); ++cnt) { int n = CPU_COUNT (&c); if (n != cnt) |