diff --git a/[refs] b/[refs] index e1924f5874e2..bb93a0bcb68a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58a84aa92723d1ac3e1cc4e3b0ff49291663f7e1 +refs/heads/master: 09761333ed47e899cc1482c13090b95f3f711971 diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 578e29174fa6..177aca424a06 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -871,9 +871,9 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, if (anon_vma) put_anon_vma(anon_vma); -out: unlock_page(hpage); +out: if (rc != -EAGAIN) { list_del(&hpage->lru); put_page(hpage);