From patchwork Mon Dec 6 08:27:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 48524 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 7CC0A3858027 for ; Mon, 6 Dec 2021 08:28:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CC0A3858027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638779301; bh=mKLHYngvrCk/WWrZujoNr7yIeDi0sISJ/E6cyd4capY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MnCcqPwp1Ukg2zWVVYTADl8Mgju+FcjQjkodu5vqEXXcF0X1HMQDcp0q8KWLNi7QF nM8tKQbYlyXZg32AzzYiDn8MvrpYhT2QPVoTrh+pvJ3kAcS1/OzpRoeeklpT9dkhYt C5aOxTMxK0ATnNz0Gn8z7aWPTDoSOzaEV1E9iDB8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 2380C3858D28 for ; Mon, 6 Dec 2021 08:28:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2380C3858D28 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-39-LLi7xjX0MzO1KsJ3s6an3g-1; Mon, 06 Dec 2021 03:27:57 -0500 X-MC-Unique: LLi7xjX0MzO1KsJ3s6an3g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 09DE883DB7E for ; Mon, 6 Dec 2021 08:27:57 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.193.123]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6235A1042A48 for ; Mon, 6 Dec 2021 08:27:56 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] misc, nptl: Remove stray references to __condvar_load_64_relaxed Date: Mon, 06 Dec 2021 09:27:54 +0100 Message-ID: <874k7mrvcl.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The function was renamed to __atomic_wide_counter_load_relaxed in commit 8bd336a00a5311bf7a9e99b3b0e9f01ff5faa74b ("nptl: Extract from pthread_cond_common.c"). --- misc/atomic_wide_counter.c | 4 ++-- nptl/pthread_cond_common.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/atomic_wide_counter.c b/misc/atomic_wide_counter.c index 56d8981925..6d395197e7 100644 --- a/misc/atomic_wide_counter.c +++ b/misc/atomic_wide_counter.c @@ -72,11 +72,11 @@ __atomic_wide_counter_fetch_add_relaxed (__atomic_wide_counter *c, add operations are ordered in happens-before. */ h++; /* S2. Release MO to synchronize with the loads of the higher-order half - in the load operation. See __condvar_load_64_relaxed. */ + in the load operation. See __atomic_wide_counter_load_relaxed. */ atomic_store_release (&c->__value32.__high, h | ((unsigned int) 1 << 31)); l ^= (unsigned int) 1 << 31; - /* S3. See __condvar_load_64_relaxed. */ + /* S3. See __atomic_wide_counter_load_relaxed. */ atomic_store_release (&c->__value32.__low, l); /* S4. Likewise. */ atomic_store_release (&c->__value32.__high, h); diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c index fb56f93b6e..78e8738210 100644 --- a/nptl/pthread_cond_common.c +++ b/nptl/pthread_cond_common.c @@ -75,7 +75,7 @@ __condvar_fetch_xor_wseq_release (pthread_cond_t *cond, unsigned int val) static uint64_t __attribute__ ((unused)) __condvar_fetch_xor_wseq_release (pthread_cond_t *cond, unsigned int val) { - /* First, get the current value. See __condvar_load_64_relaxed. */ + /* First, get the current value. See __atomic_wide_counter_load_relaxed. */ unsigned int h, l, h2; do {