diff --git a/[refs] b/[refs] index 798511a2bd9a..f12ac4be84a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ba32fde2c5be52865b2fd7e5e3752a46971fabe +refs/heads/master: 5b40dc780ed996162f3af8712eb03beb24dcdbef diff --git a/trunk/mm/swap.c b/trunk/mm/swap.c index e9ec06d845e8..b524ea90bddb 100644 --- a/trunk/mm/swap.c +++ b/trunk/mm/swap.c @@ -393,7 +393,8 @@ void pagevec_strip(struct pagevec *pvec) struct page *page = pvec->pages[i]; if (PagePrivate(page) && !TestSetPageLocked(page)) { - try_to_release_page(page, 0); + if (PagePrivate(page)) + try_to_release_page(page, 0); unlock_page(page); } }