Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'sched/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Thomas Gleixner:
"Two small scheduler fixes:
- Take hotplug lock in sched_init_smp(). Technically not really
required, but lockdep will complain other.
- Trivial comment fix in sched/fair"
* 'sched/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/fair: Fix a comment in task_numa_fault()
sched/core: Take the hotplug lock in sched_init_smp()
+6
-3
+4
-1
kernel/sched/core.c
+4
-1
kernel/sched/core.c
···
5851
5851
/*
5852
5852
* There's no userspace yet to cause hotplug operations; hence all the
5853
5853
* CPU masks are stable and all blatant races in the below code cannot
5854
-
* happen.
5854
+
* happen. The hotplug lock is nevertheless taken to satisfy lockdep,
5855
+
* but there won't be any contention on it.
5855
5856
*/
5857
+
cpus_read_lock();
5856
5858
mutex_lock(&sched_domains_mutex);
5857
5859
sched_init_domains(cpu_active_mask);
5858
5860
mutex_unlock(&sched_domains_mutex);
5861
+
cpus_read_unlock();
5859
5862
5860
5863
/* Move init over to a non-isolated CPU */
5861
5864
if (set_cpus_allowed_ptr(current, housekeeping_cpumask(HK_FLAG_DOMAIN)) < 0)
+2
-2
kernel/sched/fair.c
+2
-2
kernel/sched/fair.c
···
2400
2400
local = 1;
2401
2401
2402
2402
/*
2403
-
* Retry task to preferred node migration periodically, in case it
2404
-
* case it previously failed, or the scheduler moved us.
2403
+
* Retry to migrate task to preferred node periodically, in case it
2404
+
* previously failed, or the scheduler moved us.
2405
2405
*/
2406
2406
if (time_after(jiffies, p->numa_migrate_retry)) {
2407
2407
task_numa_placement(p);