diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/sysconf.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysconf.c | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 9f2a02f3e6..b5bc325c1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-23 Andreas Schwab <schwab@redhat.com> + + * sysdeps/unix/sysv/linux/ia64/sysconf.c (HAS_CPUCLOCK): Add + parameter name. + * sysdeps/unix/sysv/linux/sysconf.c (has_cpuclock, HAS_CPUCLOCK): + Add parameter name. + (__sysconf): Pass it down. + 2011-05-22 Ulrich Drepper <drepper@gmail.com> [BZ #12671] diff --git a/sysdeps/unix/sysv/linux/ia64/sysconf.c b/sysdeps/unix/sysv/linux/ia64/sysconf.c index 67b8251dd3..732cc68efd 100644 --- a/sysdeps/unix/sysv/linux/ia64/sysconf.c +++ b/sysdeps/unix/sysv/linux/ia64/sysconf.c @@ -24,7 +24,7 @@ #include "has_cpuclock.c" -#define HAS_CPUCLOCK() (has_cpuclock () ? _POSIX_VERSION : -1) +#define HAS_CPUCLOCK(name) (has_cpuclock () ? _POSIX_VERSION : -1) /* Now the generic Linux version. */ diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index e44aa994ee..6e6c69e124 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -37,7 +37,7 @@ static long int posix_sysconf (int name); #ifndef HAS_CPUCLOCK static long int -has_cpuclock (void) +has_cpuclock (int name) { # if defined __NR_clock_getres || HP_TIMING_AVAIL /* If we have HP_TIMING, we will fall back on that if the system @@ -59,7 +59,7 @@ has_cpuclock (void) return -1; # endif } -# define HAS_CPUCLOCK() has_cpuclock () +# define HAS_CPUCLOCK(name) has_cpuclock (name) #endif @@ -86,7 +86,7 @@ __sysconf (int name) case _SC_CPUTIME: case _SC_THREAD_CPUTIME: - return HAS_CPUCLOCK (); + return HAS_CPUCLOCK (name); case _SC_ARG_MAX: #if __LINUX_KERNEL_VERSION < 0x020617 |