x86/cpu/intel: Rename CPUID(0x2) descriptors iterator parameter

The CPUID(0x2) descriptors iterator has been renamed from:

    for_each_leaf_0x2_entry()

to:

    for_each_cpuid_0x2_desc()

since it iterates over CPUID(0x2) cache and TLB "descriptors", not
"entries".

In the macro's x86/cpu call-site, rename the parameter denoting the
parsed descriptor at each iteration from 'entry' to 'desc'.

Signed-off-by: Ahmed S. Darwish <darwi@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: x86-cpuid@lists.linux.dev
Link: https://lore.kernel.org/r/20250508150240.172915-8-darwi@linutronix.de

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index f8141b5d3e30365100d477e59baaa4c961388ec9..076eaa41b8c81b2dd9be129d14dc7c8041eb2e79 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -648,11 +648,11 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
 }
 #endif
 
-static void intel_tlb_lookup(const struct leaf_0x2_table *entry)
+static void intel_tlb_lookup(const struct leaf_0x2_table *desc)
 {
-       short entries = entry->entries;
+       short entries = desc->entries;
 
-       switch (entry->t_type) {
+       switch (desc->t_type) {
        case STLB_4K:
                tlb_lli_4k = max(tlb_lli_4k, entries);
                tlb_lld_4k = max(tlb_lld_4k, entries);
@@ -709,7 +709,7 @@ static void intel_tlb_lookup(const struct leaf_0x2_table *entry)
 
 static void intel_detect_tlb(struct cpuinfo_x86 *c)
 {
-       const struct leaf_0x2_table *entry;
+       const struct leaf_0x2_table *desc;
        union leaf_0x2_regs regs;
        u8 *ptr;
 
@@ -717,8 +717,8 @@ static void intel_detect_tlb(struct cpuinfo_x86 *c)
                return;
 
        cpuid_leaf_0x2(&regs);
-       for_each_cpuid_0x2_desc(regs, ptr, entry)
-               intel_tlb_lookup(entry);
+       for_each_cpuid_0x2_desc(regs, ptr, desc)
+               intel_tlb_lookup(desc);
 }
 
 static const struct cpu_dev intel_cpu_dev = {