Commit 7a4dcb4a authored by Laurent Dufour's avatar Laurent Dufour Committed by Thomas Gleixner
Browse files

cpu/hotplug: Remove dependancy against cpu_primary_thread_mask 



The commit 18415f33 ("cpu/hotplug: Allow "parallel" bringup up to
CPUHP_BP_KICK_AP_STATE") introduce a dependancy against a global variable
cpu_primary_thread_mask exported by the X86 code. This variable is only
used when CONFIG_HOTPLUG_PARALLEL is set.

Since cpuhp_get_primary_thread_mask() and cpuhp_smt_aware() are only used
when CONFIG_HOTPLUG_PARALLEL is set, don't define them when it is not set.

No functional change.

Signed-off-by: default avatarLaurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20230705145143.40545-2-ldufour@linux.ibm.com
parent 6eaae198

kernel/cpu.c

+10 −14
Original line number Diff line number Diff line
@@ -650,22 +650,8 @@ bool cpu_smt_possible(void) 
}

EXPORT_SYMBOL_GPL(cpu_smt_possible);



static inline bool cpuhp_smt_aware(void)

{

	return topology_smt_supported();

}



static inline const struct cpumask *cpuhp_get_primary_thread_mask(void)

{

	return cpu_primary_thread_mask;

}

#else

static inline bool cpu_smt_allowed(unsigned int cpu) { return true; }

static inline bool cpuhp_smt_aware(void) { return false; }

static inline const struct cpumask *cpuhp_get_primary_thread_mask(void)

{

	return cpu_present_mask;

}

#endif



static inline enum cpuhp_state
@@ -1793,6 +1779,16 @@ static int __init parallel_bringup_parse_param(char *arg) 
}

early_param("cpuhp.parallel", parallel_bringup_parse_param);



static inline bool cpuhp_smt_aware(void)

{

	return topology_smt_supported();

}



static inline const struct cpumask *cpuhp_get_primary_thread_mask(void)

{

	return cpu_primary_thread_mask;

}



/*

 * On architectures which have enabled parallel bringup this invokes all BP

 * prepare states for each of the to be onlined APs first. The last state