diff --git a/[refs] b/[refs] index 59e5f2175371..c7db3a791c31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90a5d5af74f6570af063fb6bff33c6b2f8361bbc +refs/heads/master: 937a94c9db30a818baa5e2c09dbf4589251355c3 diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 177aca424a06..594dc375d0f9 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -269,12 +269,12 @@ static int migrate_page_move_mapping(struct address_space *mapping, radix_tree_replace_slot(pslot, newpage); - page_unfreeze_refs(page, expected_count); /* - * Drop cache reference from old page. + * Drop cache reference from old page by unfreezing + * to one less reference. * We know this isn't the last reference. */ - __put_page(page); + page_unfreeze_refs(page, expected_count - 1); /* * If moved to a different zone then also account @@ -334,9 +334,7 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, radix_tree_replace_slot(pslot, newpage); - page_unfreeze_refs(page, expected_count); - - __put_page(page); + page_unfreeze_refs(page, expected_count - 1); spin_unlock_irq(&mapping->tree_lock); return 0;