Commit fb7fb84a authored by Qais Yousef's avatar Qais Yousef Committed by Thomas Gleixner
Browse files

cpu/hotplug: Remove __freeze_secondary_cpus() 



The refactored function is no longer required as the codepaths that call
freeze_secondary_cpus() are all suspend/resume related now.

Signed-off-by: default avatarQais Yousef <qais.yousef@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Link: https://lkml.kernel.org/r/20200430114004.17477-2-qais.yousef@arm.com
parent 56555855

include/linux/cpu.h

+1 −6
Original line number Diff line number Diff line
@@ -144,12 +144,7 @@ static inline void get_online_cpus(void) { cpus_read_lock(); } 
static inline void put_online_cpus(void) { cpus_read_unlock(); }



#ifdef CONFIG_PM_SLEEP_SMP

int __freeze_secondary_cpus(int primary, bool suspend);

static inline int freeze_secondary_cpus(int primary)

{

	return __freeze_secondary_cpus(primary, true);

}



extern int freeze_secondary_cpus(int primary);

extern void thaw_secondary_cpus(void);



static inline int suspend_disable_secondary_cpus(void)

kernel/cpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus) 
#ifdef CONFIG_PM_SLEEP_SMP

static cpumask_var_t frozen_cpus;



int __freeze_secondary_cpus(int primary, bool suspend)

int freeze_secondary_cpus(int primary)

{

	int cpu, error = 0;
@@ -1352,7 +1352,7 @@ int __freeze_secondary_cpus(int primary, bool suspend) 
		if (cpu == primary)

			continue;



		if (suspend && pm_wakeup_pending()) {

		if (pm_wakeup_pending()) {

			pr_info("Wakeup pending. Abort CPU freeze\n");

			error = -EBUSY;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE