diff --git a/[refs] b/[refs] index cc8c15e983f0..6b30b27c5275 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d9ee6a2d4a6e92c49e6fa9469e5731d21ee203e +refs/heads/master: 47f43e7efadacc627f325aba64c6a547de0926db diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c index cd7e6974de77..757f6b0accfe 100644 --- a/trunk/mm/memory-failure.c +++ b/trunk/mm/memory-failure.c @@ -235,7 +235,7 @@ void shake_page(struct page *p, int access) int nr; do { nr = shrink_slab(1000, GFP_KERNEL, 1000); - if (page_count(p) == 0) + if (page_count(p) == 1) break; } while (nr > 10); }