diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2016-05-17 15:10:09 +0000 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2016-05-17 15:10:09 +0000 |
| commit | 99e17f8a0421fd1958bdee92e7e66c22b89d9556 (patch) | |
| tree | 15cacceadb018151ac80cd34c786cef5818d614d /mm/mlock.c | |
| parent | 914edc40eafa0dabf561bf29c8e768a4b636e7f5 (diff) | |
| parent | 08e85b5fa9b0d262c8d69709088ec7fbbab2ad28 (diff) | |
Merge branch 'android-hikey-linaro-4.4' of https://android.googlesource.com/kernel/hikey-linaro into clang-4.4android-hikey-linaro-4.4-clang
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index a6617735f2f4..d843bc9d32dd 100644 --- 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 */ |