2 files changed, 8 insertions, 4 deletions

diff --git a/mm/internal.h b/mm/internal.h
index f5f295fe11e1..a4fa284f6bc2 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -180,7 +180,8 @@ static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
                 return 0;
 
         if (!TestSetPageMlocked(page)) {
-                inc_zone_page_state(page, NR_MLOCK);
+                mod_zone_page_state(page_zone(page), NR_MLOCK,
+                                    hpage_nr_pages(page));
                 count_vm_event(UNEVICTABLE_PGMLOCKED);
         }
         return 1;
diff --git a/mm/mlock.c b/mm/mlock.c
index de7321592897..f0b9ce572fc7 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -56,7 +56,8 @@ void clear_page_mlock(struct page *page)
         if (!TestClearPageMlocked(page))
                 return;
 
-        dec_zone_page_state(page, NR_MLOCK);
+        mod_zone_page_state(page_zone(page), NR_MLOCK,
+                            -hpage_nr_pages(page));
         count_vm_event(UNEVICTABLE_PGCLEARED);
         if (!isolate_lru_page(page)) {
                 putback_lru_page(page);
@@ -78,7 +79,8 @@ void mlock_vma_page(struct page *page)
         BUG_ON(!PageLocked(page));
 
         if (!TestSetPageMlocked(page)) {
-                inc_zone_page_state(page, NR_MLOCK);
+                mod_zone_page_state(page_zone(page), NR_MLOCK,
+                                    hpage_nr_pages(page));
                 count_vm_event(UNEVICTABLE_PGMLOCKED);
                 if (!isolate_lru_page(page))
                         putback_lru_page(page);
@@ -105,7 +107,8 @@ void munlock_vma_page(struct page *page)
         BUG_ON(!PageLocked(page));
 
         if (TestClearPageMlocked(page)) {
-                dec_zone_page_state(page, NR_MLOCK);
+                mod_zone_page_state(page_zone(page), NR_MLOCK,
+                                    -hpage_nr_pages(page));
                 if (!isolate_lru_page(page)) {
                         int ret = SWAP_AGAIN;