leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/hotplug: Remove __freeze_secondary_cpus()

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

Signed-off-by: Qais Yousef <qais.yousef@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Link: https://lkml.kernel.org/r/20200430114004.17477-2-qais.yousef@arm.com
This commit is contained in:
Qais Yousef 2020-04-30 12:40:04 +01:00 committed by Thomas Gleixner
parent 5655585589
commit fb7fb84a0c
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/cpu.h
View File

@ -144,12 +144,7 @@ static inline void get_online_cpus(void) { cpus_read_lock(); }
static inline void put_online_cpus(void) { cpus_read_unlock(); } static inline void put_online_cpus(void) { cpus_read_unlock(); }
#ifdef CONFIG_PM_SLEEP_SMP #ifdef CONFIG_PM_SLEEP_SMP
int __freeze_secondary_cpus(int primary, bool suspend); extern int freeze_secondary_cpus(int primary);
static inline int freeze_secondary_cpus(int primary)
{
return __freeze_secondary_cpus(primary, true);
}
extern void thaw_secondary_cpus(void); extern void thaw_secondary_cpus(void);
static inline int suspend_disable_secondary_cpus(void) static inline int suspend_disable_secondary_cpus(void)

4
kernel/cpu.c
View File

@ -1327,7 +1327,7 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus)
#ifdef CONFIG_PM_SLEEP_SMP #ifdef CONFIG_PM_SLEEP_SMP
static cpumask_var_t frozen_cpus; static cpumask_var_t frozen_cpus;
int __freeze_secondary_cpus(int primary, bool suspend) int freeze_secondary_cpus(int primary)
{ {
int cpu, error = 0; int cpu, error = 0;
@ -1352,7 +1352,7 @@ int __freeze_secondary_cpus(int primary, bool suspend)
if (cpu == primary) if (cpu == primary)
continue; continue;
if (suspend && pm_wakeup_pending()) { if (pm_wakeup_pending()) {
pr_info("Wakeup pending. Abort CPU freeze\n"); pr_info("Wakeup pending. Abort CPU freeze\n");
error = -EBUSY; error = -EBUSY;
break; break;