On Wed, 2024-12-11 at 18:55 +0000, K Prateek Nayak wrote:
> x86_*_flags() wrappers were introduced with commit d3d37d850d1d
> ("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 995998ebdebd ("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 <kprateek.nayak@amd.com>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Tim
> ---
> arch/x86/kernel/smpboot.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index b5a8f0891135..6e300897b7ee 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -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