public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] misc, nptl: Remove stray references to __condvar_load_64_relaxed
Date: Mon,  6 Dec 2021 08:27:44 +0000 (GMT)	[thread overview]
Message-ID: <20211206082744.6F78C3858D28@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=68007900beef12000ed90f38c251eaf32fbc0490

commit 68007900beef12000ed90f38c251eaf32fbc0490
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Dec 6 08:01:08 2021 +0100

    misc, nptl: Remove stray references to __condvar_load_64_relaxed
    
    The function was renamed to __atomic_wide_counter_load_relaxed
    in commit 8bd336a00a5311bf7a9e99b3b0e9f01ff5faa74b ("nptl: Extract
    <bits/atomic_wide_counter.h> from pthread_cond_common.c").

Diff:
---
 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
     {


                 reply	other threads:[~2021-12-06  8:27 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211206082744.6F78C3858D28@sourceware.org \
    --to=fw@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).