Merge branch 'karo-tx6-mainline' into stable

[karo-tx-linux.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 339d9e0949b6d63a1b81af1e121c1858af77f472..d6006b146fea38c0f897bbcb721dec70a189c92c 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 */