From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2076) id EAA543857C73; Wed, 30 Sep 2020 07:40:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAA543857C73 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Lukasz Majewski To: glibc-cvs@sourceware.org Subject: [glibc] nptl: futex: Move __NR_futex_time64 alias to beginning of futex-internal.h X-Act-Checkin: glibc X-Git-Author: Lukasz Majewski X-Git-Refname: refs/heads/master X-Git-Oldrev: 3f9705f1fc7c3b0a5ffd7039c64935946a4cc300 X-Git-Newrev: e75fbaaa21563cecccfda9705260ae0b608ed660 Message-Id: <20200930074021.EAA543857C73@sourceware.org> Date: Wed, 30 Sep 2020 07:40:21 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2020 07:40:22 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e75fbaaa21563cecccfda9705260ae0b608ed660 commit e75fbaaa21563cecccfda9705260ae0b608ed660 Author: Lukasz Majewski Date: Tue Sep 8 10:48:13 2020 +0200 nptl: futex: Move __NR_futex_time64 alias to beginning of futex-internal.h This alias macro shall be moved to the beginning of the futex-internal.h to be easily reused by other functions, which would support 64 bit time. Reviewed-by: Alistair Francis Reviewed-by: Adhemerval Zanella Diff: --- sysdeps/nptl/futex-internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h index 84ab3f3853..7f3910ad98 100644 --- a/sysdeps/nptl/futex-internal.h +++ b/sysdeps/nptl/futex-internal.h @@ -74,6 +74,10 @@ # error FUTEX_PRIVATE must be equal to 0 #endif +#ifndef __NR_futex_time64 +# define __NR_futex_time64 __NR_futex +#endif + /* Calls __libc_fatal with an error message. Convenience function for concrete implementations of the futex interface. */ static __always_inline __attribute__ ((__noreturn__)) void @@ -467,10 +471,6 @@ futex_unlock_pi (unsigned int *futex_word, int private) } } -#ifndef __NR_futex_time64 -# define __NR_futex_time64 __NR_futex -#endif - static __always_inline int futex_timed_wait_cancel64 (pid_t *tidp, pid_t tid, const struct __timespec64 *timeout, int private)