diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:26:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-01 18:26:59 -0700 |
| commit | 32439700fe1c0fc3c2d3f2aedd3ad6707c88b8ba (patch) | |
| tree | eb65ec1f536354bc7d48a7179b14224726a28329 /kernel/cpu.c | |
| parent | a4bf79eb6a42e863e0fccf19f9383c618e8efc43 (diff) | |
| parent | 6acbfb96976fc3350e30d964acb1dbbdf876d55e (diff) | |
| download | lwn-32439700fe1c0fc3c2d3f2aedd3ad6707c88b8ba.tar.gz lwn-32439700fe1c0fc3c2d3f2aedd3ad6707c88b8ba.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Various fixlets, mostly related to the (root-only) SCHED_DEADLINE
policy, but also a hotplug bug fix and a fix for a NR_CPUS related
overallocation bug causing a suspend/resume regression"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Fix hotplug vs. set_cpus_allowed_ptr()
sched/cpupri: Replace NR_CPUS arrays
sched/deadline: Replace NR_CPUS arrays
sched/deadline: Restrict user params max value to 2^63 ns
sched/deadline: Change sched_getparam() behaviour vs SCHED_DEADLINE
sched: Disallow sched_attr::sched_policy < 0
sched: Make sched_setattr() correctly return -EFBIG
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index a9e710eef0e2..247979a1b815 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -726,10 +726,12 @@ void set_cpu_present(unsigned int cpu, bool present) void set_cpu_online(unsigned int cpu, bool online) { - if (online) + if (online) { cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits)); - else + cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits)); + } else { cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits)); + } } void set_cpu_active(unsigned int cpu, bool active) |