From patchwork Mon Nov 23 19:52:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 41168 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA7A3383F85D; Mon, 23 Nov 2020 19:53:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA7A3383F85D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1606161200; bh=X5N4r5Aqt0CHYAWRMj3IelhhjbpcHRfiIzeHglnkdgo=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GSvK9joobjME7ApdYpWnXVqvfPZc3m4/CXO1UVHPl6AXv1ybGI8dzqRaH3hYzE13T 5cUf6BIXgoVJFUlQtzB4TNQiLLMdrHbJJjt/+tWwKVgnORZnmF7fzTFxsymkG7Gw83 uxZTeZCICfVn0k2lkhtWXSnhHb5ACBM9rG+WnqDk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id C5FD1383F85D for ; Mon, 23 Nov 2020 19:53:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C5FD1383F85D Received: by mail-qt1-x844.google.com with SMTP id d5so5279742qtn.0 for ; Mon, 23 Nov 2020 11:53:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X5N4r5Aqt0CHYAWRMj3IelhhjbpcHRfiIzeHglnkdgo=; b=dgDyIv+NEgaUM7LqJFxft0z2XwGaiIVc9RNgaGiTgKfxkKDKkZ3LqfXkdeQkEPms7Y wAr3774kiBnYpWcVjX2oRaBxYd3xPx8pVaORpx4zNpD/GcwhubtFNeM6dVYXcLs/0ZTL QzxTLGtASV9QvwfMuIuf1swDQ8E3ELrNiOTgOEjDJkFQ+K7Nv3NW8Uox9LK5iDbHTN+z 1VaUCokSkoFwWrvhb85GW9RrZwQRvYfClmW4JPIwBMHr8GN1PnQ3FUwgowb3JjtF+CDE XVKC3YLcwEGV/3kaS9XlvfKpgF0KL+XYdfNwY4SSb4lD9N1pC2EmzGL9tCIMfQxkbQg5 4cHg== X-Gm-Message-State: AOAM531gIZxUWAjtjvNLuu56QvVqCSaQbo+pgJ8qTx0E9GW4cMAzTlaT +qJeh5tvugU4L08wmX3KL70Ejyl2b5SJcw== X-Google-Smtp-Source: ABdhPJyyTUSdWfutTDpPpF+4w44nMcSw8scj3Khm09a5fM5vY8dE6VtngbUTDY61B5t+oEGGJXLSOQ== X-Received: by 2002:ac8:6f46:: with SMTP id n6mr799018qtv.151.1606161198266; Mon, 23 Nov 2020 11:53:18 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id v9sm10440432qkv.34.2020.11.23.11.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:53:17 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 10/13] linux: nptl: Replace lll_futex_supported_clockid with futex-internal.h Date: Mon, 23 Nov 2020 16:52:53 -0300 Message-Id: <20201123195256.3336217-10-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201123195256.3336217-1-adhemerval.zanella@linaro.org> References: <20201123195256.3336217-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Cc: Michael Kerrisk Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The idea is to make NPTL implementation to use on the functions provided by futex-internal.h. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Lukasz Majewski --- nptl/pthread_mutex_timedlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index 343acf6107..b42862193a 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -600,7 +600,7 @@ __pthread_mutex_clocklock64 (pthread_mutex_t *mutex, clockid_t clockid, const struct __timespec64 *abstime) { - if (__glibc_unlikely (!lll_futex_supported_clockid (clockid))) + if (__glibc_unlikely (!futex_abstimed_supported_clockid (clockid))) return EINVAL; LIBC_PROBE (mutex_clocklock_entry, 3, mutex, clockid, abstime);