Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler updates from Ingo Molnar: "The main changes in this cycle were: - Make nohz housekeeping processing more permissive and less intrusive to isolated CPUs - Decouple CPU-bound workqueue acconting from the scheduler and move it into the workqueue code. - Optimize topology building - Better handle quota and period overflows - Add more RCU annotations - Comment updates, misc cleanups" * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits) nohz_full: Allow the boot CPU to be nohz_full sched/isolation: Require a present CPU in housekeeping mask kernel/cpu: Allow non-zero CPU to be primary for suspend / kexec freeze power/suspend: Add function to disable secondaries for suspend sched/core: Allow the remote scheduler tick to be started on CPU0 sched/nohz: Run NOHZ idle load balancer on HK_FLAG_MISC CPUs sched/debug: Fix spelling mistake "logaritmic" -> "logarithmic" sched/topology: Update init_sched_domains() comment cgroup/cpuset: Update stale generate_sched_domains() comments sched/core: Check quota and period overflow at usec to nsec conversion sched/core: Handle overflow in cpu_shares_write_u64 sched/rt: Check integer overflow at usec to nsec conversion sched/core: Fix typo in comment sched/core: Make some functions static sched/core: Unify p->on_rq updates sched/core: Remove ttwu_activate() sched/core, workqueues: Distangle worker accounting from rq lock sched/fair: Remove unneeded prototype of capacity_of() sched/topology: Skip duplicate group rewrites in build_sched_groups() sched/topology: Fix build_sched_groups() comment ...
This commit is contained in:
@@ -137,9 +137,26 @@ static inline int disable_nonboot_cpus(void)
|
||||
return freeze_secondary_cpus(0);
|
||||
}
|
||||
extern void enable_nonboot_cpus(void);
|
||||
|
||||
static inline int suspend_disable_secondary_cpus(void)
|
||||
{
|
||||
int cpu = 0;
|
||||
|
||||
if (IS_ENABLED(CONFIG_PM_SLEEP_SMP_NONZERO_CPU))
|
||||
cpu = -1;
|
||||
|
||||
return freeze_secondary_cpus(cpu);
|
||||
}
|
||||
static inline void suspend_enable_secondary_cpus(void)
|
||||
{
|
||||
return enable_nonboot_cpus();
|
||||
}
|
||||
|
||||
#else /* !CONFIG_PM_SLEEP_SMP */
|
||||
static inline int disable_nonboot_cpus(void) { return 0; }
|
||||
static inline void enable_nonboot_cpus(void) {}
|
||||
static inline int suspend_disable_secondary_cpus(void) { return 0; }
|
||||
static inline void suspend_enable_secondary_cpus(void) { }
|
||||
#endif /* !CONFIG_PM_SLEEP_SMP */
|
||||
|
||||
void cpu_startup_entry(enum cpuhp_state state);
|
||||
|
Reference in New Issue
Block a user