x86/CPU/AMD: Remove amd_get_topology_early()
... and fold its function body into its single call site. No functional changes: # arch/x86/kernel/cpu/amd.o: text data bss dec hex filename 5994 385 1 6380 18ec amd.o.before 5994 385 1 6380 18ec amd.o.after md5: 99ec6daa095b502297884e949c520f90 amd.o.before.asm 99ec6daa095b502297884e949c520f90 amd.o.after.asm Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20200123165811.5288-1-bp@alien8.de
This commit is contained in:
parent
4144fddbd3
commit
3c749b81ee
@ -319,13 +319,6 @@ static void legacy_fixup_core_id(struct cpuinfo_x86 *c)
|
|||||||
c->cpu_core_id %= cus_per_node;
|
c->cpu_core_id %= cus_per_node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void amd_get_topology_early(struct cpuinfo_x86 *c)
|
|
||||||
{
|
|
||||||
if (cpu_has(c, X86_FEATURE_TOPOEXT))
|
|
||||||
smp_num_siblings = ((cpuid_ebx(0x8000001e) >> 8) & 0xff) + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Fixup core topology information for
|
* Fixup core topology information for
|
||||||
* (1) AMD multi-node processors
|
* (1) AMD multi-node processors
|
||||||
@ -717,7 +710,8 @@ static void early_init_amd(struct cpuinfo_x86 *c)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
amd_get_topology_early(c);
|
if (cpu_has(c, X86_FEATURE_TOPOEXT))
|
||||||
|
smp_num_siblings = ((cpuid_ebx(0x8000001e) >> 8) & 0xff) + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void init_amd_k8(struct cpuinfo_x86 *c)
|
static void init_amd_k8(struct cpuinfo_x86 *c)
|
||||||
|
Loading…
Reference in New Issue
Block a user