diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-04-06 22:47:29 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-04-06 22:47:29 +0000 |
| commit | bb769ab68fd7abf1b3ab4e838e6f4b9ebfafd9c6 (patch) | |
| tree | abe5b2bcfde08e73e13cca5c5b37e2fa0eaff2e4 /sysdeps/unix/sysv/linux/alpha/getsysstats.c | |
| parent | 1a51bde7717d8f0458b682576029576225cf874f (diff) | |
| download | glibc-bb769ab68fd7abf1b3ab4e838e6f4b9ebfafd9c6.tar.gz glibc-bb769ab68fd7abf1b3ab4e838e6f4b9ebfafd9c6.tar.xz glibc-bb769ab68fd7abf1b3ab4e838e6f4b9ebfafd9c6.zip | |
Update.
2001-04-06 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/e_scalb.c: Don't use FE_INVALID unless it's available. * sysdeps/generic/e_scalbf.c: Likewise. * sysdeps/generic/e_scalbl.c: Likewise. Patch by Mark Hatle <fray@mvista.com>. 2001-04-05 David S. Miller <davem@redhat.com> * sysdeps/sparc/abort-instr.h: New file. 2001-04-05 Matt Wilson <msw@redhat.com> * sysdeps/unix/sysv/linux/alpha/getsysstats.c (GET_NPROCS_PARSER): added code to parse new 2.4 format. (GET_NPROCS_CONF_PARSER): Likewise. 2001-04-05 David S. Miller <davem@redhat.com> * scripts/config.sub: Recognize sparcv9b like sparcv9. * configure.in: Add sparcv9b. * sysdeps/sparc/sparc32/sparcv9b/Implies: New file * sysdeps/sparc/sparc32/sparcv9b/memcpy.S: New file * sysdeps/sparc/sparc64/sparcv9b/memcpy.S: New file
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha/getsysstats.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/getsysstats.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/getsysstats.c b/sysdeps/unix/sysv/linux/alpha/getsysstats.c index 27355b5fe4..d86fc213bf 100644 --- a/sysdeps/unix/sysv/linux/alpha/getsysstats.c +++ b/sysdeps/unix/sysv/linux/alpha/getsysstats.c @@ -29,7 +29,9 @@ If there is no "CPUs ..." line then we are on a UP system. */ \ (RESULT) = 1; \ while (fgets_unlocked (BUFFER, sizeof (BUFFER), FP) != NULL) \ - if (sscanf (BUFFER, "CPUs probed %*d active %d", &(RESULT)) == 1) \ + if ((sscanf (BUFFER, "cpus active : %d", &(RESULT)) == 1) \ + || (sscanf (BUFFER, "CPUs probed %*d active %d", \ + &(RESULT)) == 1)) \ break; \ } \ while (0) @@ -46,7 +48,8 @@ If there is no "CPUs ..." line then we are on a UP system. */ \ (RESULT) = 1; \ while (fgets_unlocked ((BUFFER), sizeof (BUFFER), (FP)) != NULL) \ - if (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1) \ + if ((sscanf (buffer, "cpus detected : %d", &(RESULT)) == 1) \ + || (sscanf (buffer, "CPUs probed %d", &(RESULT)) == 1)) \ break; \ } \ while (0) |