diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-15 14:42:42 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-08-15 14:42:42 +0530 |
| commit | 27f659ddd0ab03ddf2a8248c6cd0d005a933ee01 (patch) | |
| tree | 3748cc6b25dfcbf5ad3ee77018e49d71fa2052fa /mm/mlock.c | |
| parent | f5ec4ffd9c9ddf29aaf339a8619a5cd145f62342 (diff) | |
| parent | f7c8f04f49568e772560bbe388895daaf9b053f6 (diff) | |
Merge remote-tracking branch 'stable-rc/linux-4.4.y' into 4.4.83-rc-hikey4.4-83-rc-hikey-20170815
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index d6006b146fea..9d2e773f3a95 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -277,7 +277,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone) { int i; int nr = pagevec_count(pvec); - int delta_munlocked; + int delta_munlocked = -nr; struct pagevec pvec_putback; int pgrescued = 0; @@ -297,6 +297,8 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone) continue; else __munlock_isolation_failed(page); + } else { + delta_munlocked++; } /* @@ -308,7 +310,6 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone) pagevec_add(&pvec_putback, pvec->pages[i]); pvec->pages[i] = NULL; } - delta_munlocked = -nr + pagevec_count(&pvec_putback); __mod_zone_page_state(zone, NR_MLOCK, delta_munlocked); spin_unlock_irq(&zone->lru_lock); |