diff options
| author | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-08-10 19:28:24 -0500 |
|---|---|---|
| committer | Noah Goldstein <goldstein.w.n@gmail.com> | 2023-08-28 15:02:19 -0500 |
| commit | f94ff95e936d41e28697bd4eac04954139b93558 (patch) | |
| tree | f0904b8808a16a8bdee3329fd1a35097351ac7fc | |
| parent | cc8243fb0b711ab05ac6dcf235f0555025921b5e (diff) | |
| download | glibc-f94ff95e936d41e28697bd4eac04954139b93558.tar.gz glibc-f94ff95e936d41e28697bd4eac04954139b93558.tar.xz glibc-f94ff95e936d41e28697bd4eac04954139b93558.zip | |
x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745]
The:
```
if (shared_per_thread > 0 && threads > 0)
shared_per_thread /= threads;
```
Code was accidentally moved to inside the else scope. This doesn't
match how it was previously (before af992e7abd).
This patch fixes that by putting the division after the `else` block.
(cherry picked from commit 084fb31bc2c5f95ae0b9e6df4d3cf0ff43471ede)
| -rw-r--r-- | sysdeps/x86/dl-cacheinfo.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h index d99c0b0e75..32b175eaf6 100644 --- a/sysdeps/x86/dl-cacheinfo.h +++ b/sysdeps/x86/dl-cacheinfo.h @@ -605,11 +605,10 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u level. */ threads = ((cpu_features->features[CPUID_INDEX_1].cpuid.ebx >> 16) & 0xff); - - /* Get per-thread size of highest level cache. */ - if (shared_per_thread > 0 && threads > 0) - shared_per_thread /= threads; } + /* Get per-thread size of highest level cache. */ + if (shared_per_thread > 0 && threads > 0) + shared_per_thread /= threads; } /* Account for non-inclusive L2 and L3 caches. */ |