Merge tag 'v4.4.3'

[firefly-linux-kernel-4.4.55.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index a6617735f2f48e35d5bb7996fb9899ec72317aae..d843bc9d32ddb077aa4aadfb156a4e2017ee94d5 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -172,7 +172,7 @@ static void __munlock_isolation_failed(struct page *page)
  */
 unsigned int munlock_vma_page(struct page *page)
 {
-       unsigned int nr_pages;
+       int nr_pages;
        struct zone *zone = page_zone(page);
 
        /* For try_to_munlock() and to serialize with page migration */