Merge branch 'sched/core' into locking/core

Required for the rtmutex/sched_deadline patches which depend on both
branches
This commit is contained in:
Thomas Gleixner 2017-04-04 11:31:12 +02:00
commit 38bffdac07
226 changed files with 3614 additions and 1830 deletions

View file

@ -1011,8 +1011,11 @@ area_found:
mutex_unlock(&pcpu_alloc_mutex);
}
if (chunk != pcpu_reserved_chunk)
if (chunk != pcpu_reserved_chunk) {
spin_lock_irqsave(&pcpu_lock, flags);
pcpu_nr_empty_pop_pages -= occ_pages;
spin_unlock_irqrestore(&pcpu_lock, flags);
}
if (pcpu_nr_empty_pop_pages < PCPU_EMPTY_POP_PAGES_LOW)
pcpu_schedule_balance_work();