Skip to content

Commit 119deb9

Browse files
Ahmed S. DarwishIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Andrew Cooper <[email protected]> Cc: John Ogness <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 4b21e71 commit 119deb9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/x86/kernel/cpu/intel.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -648,11 +648,11 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
648648
}
649649
#endif
650650

651-
static void intel_tlb_lookup(const struct leaf_0x2_table *entry)
651+
static void intel_tlb_lookup(const struct leaf_0x2_table *desc)
652652
{
653-
short entries = entry->entries;
653+
short entries = desc->entries;
654654

655-
switch (entry->t_type) {
655+
switch (desc->t_type) {
656656
case STLB_4K:
657657
tlb_lli_4k = max(tlb_lli_4k, entries);
658658
tlb_lld_4k = max(tlb_lld_4k, entries);
@@ -709,16 +709,16 @@ static void intel_tlb_lookup(const struct leaf_0x2_table *entry)
709709

710710
static void intel_detect_tlb(struct cpuinfo_x86 *c)
711711
{
712-
const struct leaf_0x2_table *entry;
712+
const struct leaf_0x2_table *desc;
713713
union leaf_0x2_regs regs;
714714
u8 *ptr;
715715

716716
if (c->cpuid_level < 2)
717717
return;
718718

719719
cpuid_leaf_0x2(&regs);
720-
for_each_cpuid_0x2_desc(regs, ptr, entry)
721-
intel_tlb_lookup(entry);
720+
for_each_cpuid_0x2_desc(regs, ptr, desc)
721+
intel_tlb_lookup(desc);
722722
}
723723

724724
static const struct cpu_dev intel_cpu_dev = {

0 commit comments

Comments
 (0)