]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
x86: Fix incorrect scope of setting `shared_per_thread` [BZ# 30745]
authorNoah Goldstein <goldstein.w.n@gmail.com>
Fri, 11 Aug 2023 00:28:24 +0000 (19:28 -0500)
committerNoah Goldstein <goldstein.w.n@gmail.com>
Mon, 28 Aug 2023 20:02:19 +0000 (15:02 -0500)
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)

sysdeps/x86/dl-cacheinfo.h

index d99c0b0e75e2996192bf1aa81273a258580c9003..32b175eaf64ebfbb0747694eac116e2a2baab86e 100644 (file)
@@ -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.  */