diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 20:54:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 20:54:34 +0300 |
| commit | 6fb11e6508eac9d2e01ba748fc13afdd657224ab (patch) | |
| tree | badf5fa97da02eab53826465ea9da21079eac0dc /mm/mlock.c | |
| parent | 3e1e21c7bfcfa9bf06c07f48a13faca2f62b3339 (diff) | |
| parent | b1b1e15ef6b80facf76d6757649dfd7295eda29f (diff) | |
| download | linux-6fb11e6508eac9d2e01ba748fc13afdd657224ab.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
ocfs2: NFS hangs in __ocfs2_cluster_lock due to race with ocfs2_unblock_lock
reiserfs: fix dereference of ERR_PTR
ratelimit: fix bug in time interval by resetting right begin time
mm: fix kernel crash in khugepaged thread
mm: fix mlock accouting
thp: change pmd_trans_huge_lock() interface to return ptl
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 e1e2b1207bf2..96f001041928 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -175,7 +175,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 */ |