Skip to content

Commit ec76dc8

Browse files
committed
x86/topology: Remove x86_smt_flags and use cpu_smt_flags directly
JIRA: https://issues.redhat.com/browse/RHEL-53784 commit 537e247 Author: K Prateek Nayak <[email protected]> Date: Mon Dec 23 04:34:03 2024 +0000 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] Signed-off-by: David Arcari <[email protected]>
1 parent 7e14825 commit ec76dc8

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
@@ -490,12 +490,6 @@ static int x86_core_flags(void)
490490
return cpu_core_flags() | x86_sched_itmt_flags();
491491
}
492492
#endif
493-
#ifdef CONFIG_SCHED_SMT
494-
static int x86_smt_flags(void)
495-
{
496-
return cpu_smt_flags();
497-
}
498-
#endif
499493
#ifdef CONFIG_SCHED_CLUSTER
500494
static int x86_cluster_flags(void)
501495
{
@@ -527,7 +521,7 @@ static void __init build_sched_topology(void)
527521

528522
#ifdef CONFIG_SCHED_SMT
529523
x86_topology[i++] = (struct sched_domain_topology_level){
530-
cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT)
524+
cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT)
531525
};
532526
#endif
533527
#ifdef CONFIG_SCHED_CLUSTER

0 commit comments

Comments
 (0)