Commit 537e2478 authored by K Prateek Nayak's avatar K Prateek Nayak Committed by Peter Zijlstra
Browse files

x86/topology: Remove x86_smt_flags and use cpu_smt_flags directly 



x86_*_flags() wrappers were introduced with commit d3d37d85
("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 995998eb ("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: default avatarK Prateek Nayak <kprateek.nayak@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarTim Chen <tim.c.chen@linux.intel.com>
Link: https://lore.kernel.org/r/20241223043407.1611-5-kprateek.nayak@amd.com
parent d04013a4

arch/x86/kernel/smpboot.c

+1 −7
Original line number Diff line number Diff line
@@ -482,12 +482,6 @@ static int x86_core_flags(void) 
	return cpu_core_flags() | x86_sched_itmt_flags();

}

#endif

#ifdef CONFIG_SCHED_SMT

static int x86_smt_flags(void)

{

	return cpu_smt_flags();

}

#endif

#ifdef CONFIG_SCHED_CLUSTER

static int x86_cluster_flags(void)

{
@@ -519,7 +513,7 @@ static void __init build_sched_topology(void) 


#ifdef CONFIG_SCHED_SMT

	x86_topology[i++] = (struct sched_domain_topology_level){

		cpu_smt_mask, x86_smt_flags, SD_INIT_NAME(SMT)

		cpu_smt_mask, cpu_smt_flags, SD_INIT_NAME(SMT)

	};

#endif

#ifdef CONFIG_SCHED_CLUSTER