diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-31 12:02:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-31 12:02:04 +0800 |
| commit | 6b69866928947d66fdb5af0c798066f9506dd3f9 (patch) | |
| tree | d51513d89658a57758272f6c2975fd9fe48c31e5 /mm | |
| parent | 6cfa28eca52e58f4ee4b007babe03cd7d61ebad3 (diff) | |
| parent | 0a5766a6a73b1eb6a0dfa74adc40272e555ac2f0 (diff) | |
Merge tag 'v4.4.58' into linux-linaro-lsk-v4.4
This is the 4.4.58 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/percpu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 1f376bce413c..ef6353f0adbd 100644 --- a/mm/percpu.c +++ b/mm/percpu.c @@ -1012,8 +1012,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(); |