History

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.

Qais Yousef committed 6 years ago

Commit fb7fb841 parent 56555852 files · +3 −8Browse files

Unified · Split

2 files
  1. include/linux/cpu.h +1 −6
  2. kernel/cpu.c +2 −2
include/linux/cpu.h+1−6
@@ -144,12 +144,7 @@ static inline void get_online_cpus(void) { cpus_read_lock(); } · 143 unmodified lines
144static inline void put_online_cpus(void) { cpus_read_unlock(); }144static inline void put_online_cpus(void) { cpus_read_unlock(); }
145 145
146#ifdef CONFIG_PM_SLEEP_SMP146#ifdef CONFIG_PM_SLEEP_SMP
147int __freeze_secondary_cpus(int primary, bool suspend);147extern int freeze_secondary_cpus(int primary);
148static inline int freeze_secondary_cpus(int primary)
149{
150 return __freeze_secondary_cpus(primary, true);
151}
152
153extern void thaw_secondary_cpus(void);148extern void thaw_secondary_cpus(void);
154 149
155static inline int suspend_disable_secondary_cpus(void)150static inline int suspend_disable_secondary_cpus(void)
kernel/cpu.c+2−2
@@ -1327,7 +1327,7 @@ void bringup_nonboot_cpus(unsigned int setup_max_cpus) · 1326 unmodified lines
1327#ifdef CONFIG_PM_SLEEP_SMP1327#ifdef CONFIG_PM_SLEEP_SMP
1328static cpumask_var_t frozen_cpus;1328static cpumask_var_t frozen_cpus;
1329 1329
1330int __freeze_secondary_cpus(int primary, bool suspend)1330int freeze_secondary_cpus(int primary)
1331{1331{
1332 int cpu, error = 0;1332 int cpu, error = 0;
1333 1333
@@ -1352,7 +1352,7 @@ int __freeze_secondary_cpus(int primary, bool suspend) · 18 unmodified lines
1352 if (cpu == primary)1352 if (cpu == primary)
1353 continue;1353 continue;
1354 1354
1355 if (suspend && pm_wakeup_pending()) {1355 if (pm_wakeup_pending()) {
1356 pr_info("Wakeup pending. Abort CPU freeze\n");1356 pr_info("Wakeup pending. Abort CPU freeze\n");
1357 error = -EBUSY;1357 error = -EBUSY;
1358 break;1358 break;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t