Skip to content

Commit 537e247

Browse files
kudureranganathPeter Zijlstra
authored andcommitted
x86/topology: Remove x86_smt_flags and use cpu_smt_flags directly
x86_*_flags() wrappers were introduced with commit d3d37d8 ("x86/sched: Add SD_ASYM_PACKING flags to x86 ITMT CPU") to add x86_sched_itmt_flags() in addition to the default domain flags for SMT and MC domain. commit 995998e ("x86/sched: Remove SD_ASYM_PACKING from the SMT domain flags") removed the ITMT flags for SMT domain but not the x86_smt_flags() wrappers which directly returns cpu_smt_flags(). Remove x86_smt_flags() and directly use cpu_smt_flags() to derive the flags for SMT domain. No functional changes intended. Signed-off-by: K Prateek Nayak <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Tim Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent d04013a commit 537e247

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

arch/x86/kernel/smpboot.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -482,12 +482,6 @@ static int x86_core_flags(void)
482482
return cpu_core_flags() | x86_sched_itmt_flags();
483483
}
484484
#endif
485-
#ifdef CONFIG_SCHED_SMT
486-
static int x86_smt_flags(void)
487-
{
488-
return cpu_smt_flags();
489-
}
490-
#endif
491485
#ifdef CONFIG_SCHED_CLUSTER
492486
static int x86_cluster_flags(void)
493487
{
@@ -519,7 +513,7 @@ static void __init build_sched_topology(void)
519513

520514
#ifdef CONFIG_SCHED_SMT
521515
x86_topology[i++] = (struct sched_domain_topology_level){
522-
cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT)
516+
cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT)
523517
};
524518
#endif
525519
#ifdef CONFIG_SCHED_CLUSTER

0 commit comments

Comments
 (0)