From patchwork Tue Jun 12 20:19:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 928478 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-93104-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="GK32FZEh"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4151TL4spNz9s0w for ; Wed, 13 Jun 2018 06:20:06 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:from:subject:message-id:date:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=Je4 TRLpJcF3MvF7UdgY/MEBuKH0wusQZYwpp5pg/qLRBPtjRVUMHmYjZ74YmYVa4LjT oplRZg8oqRCJXiFB6jakDeiieHH1xOexw4qPJNTkazOdV97WlMUXKm5POEeNXEeO ysgZrcWBpQSExwBhROFXxoIN+lbsMaW/NJkWl5Jc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:from:subject:message-id:date:mime-version :content-type:content-transfer-encoding; s=default; bh=IAANaAd+/ jOf3w97FyIsg7KVCjY=; b=GK32FZEhF5YWW6Qyr/qq+456E5XSGxF1MB2jh92pt Yf1uRwQ1/rgzu4h57//91ML9oA0MkBtWvMNCu6MI2Pf1AO72G4vFIGUyMdf1SlV7 92pRmpjKTDWlavFYJ+W5Gv7u4Vtu82sDdQ9En+BYtzTKnAgSMlU0LYO037u7ywsB hQ= Received: (qmail 84817 invoked by alias); 12 Jun 2018 20:20:00 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 83896 invoked by uid 89); 12 Jun 2018 20:19:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, URIBL_RED autolearn=ham version=3.3.2 spammy=backported X-HELO: mail-qk0-f181.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=7c0U+aPGDhFMpxltrRmM/NeoBAmhwBc3/QJarplg7Kk=; b=XijSu2z2+tJ95RkaDVGAViugVy2hz/foH6rnwUR9loZHVjd1nyZQQiPRlLA4eWk9G7 9xtuTTtYzUIqotLCcTGBihQO9YbAp1pOHq800ATxZMgjYxj0v5mchh1kwfJiLkHXU6sQ KRNuUSC1PrAT8HIvIb+we7wGTmTDRpj5tuWw9EivN4oKDaFgdINKpcFdmjde+Q3Q4Z/+ jsy8mfpm+VdYCM2HL9Yd/M/4MkhtaZuvlIMeeyoq6w649Wv0FFzu8KLIbscpFVJEE6EH 4loOI2Ou9XykiQ8HWU3L3njGU25wdWuKYd9sw6J1pkZqpY5ouhVQyiaPdtvwDciAIxkq 2IUA== X-Gm-Message-State: APt69E0BYQ2JPSPKX8BXcldpUIZgLVcAoHHWssjxCHI1qSH9pBG4y0Wo nodKOSvI00EvG0CTQsHLzp+9nfdzf/I= X-Google-Smtp-Source: ADUXVKJWyHMP6xWMqwhWUBwpfCnn010fKPFlZiwZQ0JgVSF8carxqb/qEnEh7NW9MS42SsI5UVy53w== X-Received: by 2002:a37:d18f:: with SMTP id o15-v6mr1855896qkl.423.1528834794149; Tue, 12 Jun 2018 13:19:54 -0700 (PDT) To: GNU C Library From: Carlos O'Donell Subject: [COMMITTED] Fix fallback path in __pthread_mutex_timedlock (). Message-ID: Date: Tue, 12 Jun 2018 16:19:51 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Fix the typo in the fallback path in __pthread_mutex_timedlock () whic hcalls lll_futex_timed_wait (). This is only useful for cases where the patch is being backported to older distributions where only lll_futex_timed_wait () is available. --- ChangeLog | 5 +++++ nptl/pthread_mutex_timedlock.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cb3edd3160..f3ba045896 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-06-12 Carlos O'Donell + + * nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock): Call + lll_futex_timed_wait. + 2018-06-12 Joseph Myers [BZ #23277] diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index 66efd3989f..28237b0e58 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -287,7 +287,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, /* Block using the futex. */ #if (!defined __ASSUME_FUTEX_CLOCK_REALTIME \ || !defined lll_futex_timed_wait_bitset) - lll_futex_timed wait (&mutex->__data.__lock, oldval, + lll_futex_timed_wait (&mutex->__data.__lock, oldval, &rt, PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); #else int err = lll_futex_timed_wait_bitset (&mutex->__data.__lock,