diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-12-06 08:01:08 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-12-06 08:01:08 +0100 |
| commit | 68007900beef12000ed90f38c251eaf32fbc0490 (patch) | |
| tree | cffdc901f121e7464d60506ab67258d48ac38b3b | |
| parent | 4fb4e7e821e36180835bf88e363f9f13b5797e3a (diff) | |
| download | glibc-68007900beef12000ed90f38c251eaf32fbc0490.tar.gz glibc-68007900beef12000ed90f38c251eaf32fbc0490.tar.xz glibc-68007900beef12000ed90f38c251eaf32fbc0490.zip | |
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").
| -rw-r--r-- | misc/atomic_wide_counter.c | 4 | ||||
| -rw-r--r-- | 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 { |