diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-20 10:18:16 +0200 |
| commit | 6af597de62a365dfec6021b9796aa302044e7cc3 (patch) | |
| tree | 23e365cc4a4e6dff940f5acbb466edbe28160d68 /kernel/sched/core.c | |
| parent | 558a65bc31a0c7811b34dad32f51f47c55a40000 (diff) | |
| parent | 5aa5050787f449e7eaef2c5ec93c7b357aa7dcdc (diff) | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes and resolve conflicts
Conflicts:
kernel/sched/fair.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
| -rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1764a0f2a75b..f45a7c70f264 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7261,9 +7261,6 @@ void __init sched_init_smp(void) alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL); alloc_cpumask_var(&fallback_doms, GFP_KERNEL); - /* nohz_full won't take effect without isolating the cpus. */ - tick_nohz_full_add_cpus_to(cpu_isolated_map); - sched_init_numa(); /* |