From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2076) id CE98D3857C73; Wed, 30 Sep 2020 07:40:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CE98D3857C73 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: Provide proper spelling for 32 bit version of futex_abstimed_wait X-Act-Checkin: glibc X-Git-Author: Lukasz Majewski X-Git-Refname: refs/heads/master X-Git-Oldrev: cef95fdc2e4002ee6357d8d40ef73c8d875720e3 X-Git-Newrev: 3f9705f1fc7c3b0a5ffd7039c64935946a4cc300 Message-Id: <20200930074016.CE98D3857C73@sourceware.org> Date: Wed, 30 Sep 2020 07:40:16 +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:16 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3f9705f1fc7c3b0a5ffd7039c64935946a4cc300 commit 3f9705f1fc7c3b0a5ffd7039c64935946a4cc300 Author: Lukasz Majewski Date: Wed Sep 16 09:38:52 2020 +0200 nptl: Provide proper spelling for 32 bit version of futex_abstimed_wait This change provides proper spelling of 32 bit __futex_abstimed_wait_cancelable32 function Reviewed-by: Alistair Francis Diff: --- sysdeps/nptl/futex-internal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sysdeps/nptl/futex-internal.c b/sysdeps/nptl/futex-internal.c index 1594cb6166..a2e355bf86 100644 --- a/sysdeps/nptl/futex-internal.c +++ b/sysdeps/nptl/futex-internal.c @@ -24,10 +24,10 @@ #ifndef __ASSUME_TIME64_SYSCALLS static int -__futex_abstimed_wait_cancellable32 (unsigned int* futex_word, - unsigned int expected, clockid_t clockid, - const struct __timespec64* abstime, - int private) +__futex_abstimed_wait_cancelable32 (unsigned int* futex_word, + unsigned int expected, clockid_t clockid, + const struct __timespec64* abstime, + int private) { struct timespec ts32, *pts32 = NULL; if (abstime != NULL) @@ -74,8 +74,8 @@ __futex_abstimed_wait_cancelable64 (unsigned int* futex_word, FUTEX_BITSET_MATCH_ANY); #ifndef __ASSUME_TIME64_SYSCALLS if (err == -ENOSYS) - err = __futex_abstimed_wait_cancellable32 (futex_word, expected, - clockid, abstime, private); + err = __futex_abstimed_wait_cancelable32 (futex_word, expected, + clockid, abstime, private); #endif switch (err)