From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17710 invoked by alias); 23 May 2011 13:41:14 -0000 Received: (qmail 17689 invoked by uid 22791); 23 May 2011 13:41:14 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 23 May 2011 13:40:56 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4NDeuSk031775 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 23 May 2011 09:40:56 -0400 Received: from hase (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4NDesct025508 for ; Mon, 23 May 2011 09:40:55 -0400 From: Andreas Schwab To: libc-hacker@sourceware.org Subject: [PATCH] Fix sysconf compilation for !HP_TIMING_AVAIL archs X-Yow: I'm ZIPPY!! Are we having FUN yet?? Date: Mon, 23 May 2011 13:41:00 -0000 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2011-05/txt/msg00008.txt.bz2 2011-05-23 Andreas Schwab * 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. --- sysdeps/unix/sysv/linux/ia64/sysconf.c | 2 +- sysdeps/unix/sysv/linux/sysconf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/ia64/sysconf.c b/sysdeps/unix/sysv/linux/ia64/sysconf.c index 67b8251..732cc68 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 e44aa99..6e6c69e 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 -- 1.7.4.4 -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."