x86/CPU/AMD: Remove amd_get_topology_early()
Borislav Petkov
maintainerPATCH 1/1 x86/CPU/AMD: Remove amd_get_topology_early()
From: Borislav Petkov <[email protected]>
... 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 <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -8
@@ -319,13 +319,6 @@ static void legacy_fixup_core_id(struct cpuinfo_x86 *c) 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 * (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)
Signature · 1 line
2.21.0
The following commit has been merged into the x86/cleanups branch of tip:
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 3c749b81ee99ef1a01d342ee5e4bc01e4332eb75 Gitweb: https://git.kernel.org/tip/3c749b81ee99ef1a01d342ee5e4bc01e4332eb75 Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 23 Jan 2020 17:54:33 +01:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Sat, 25 Jan 2020 12:59:46 +01:00
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 <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/x86/kernel/cpu/amd.c +2 -8
@@ -319,13 +319,6 @@ static void legacy_fixup_core_id(struct cpuinfo_x86 *c) 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 * (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)