From 1af4f4ed324564498b40a2a678079a8bef310411 Mon Sep 17 00:00:00 2001 From: "Srivatsa S. Bhat" Date: Mon, 29 Apr 2013 15:08:16 -0700 Subject: [PATCH] --- yaml --- r: 365437 b: refs/heads/master c: c73e5c9c59a0f7ba30b3e5f7bd2d8097d4c89c6d h: refs/heads/master i: 365435: ef290d1c26cb997b00359d741c8b98d4630a7403 v: v3 --- [refs] | 2 +- trunk/mm/migrate.c | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index fcd570fb1796..b9978e61c16d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52f37629fd3c7b24e1e6c125e665454cd7ac1acb +refs/heads/master: c73e5c9c59a0f7ba30b3e5f7bd2d8097d4c89c6d diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index c87ef9207853..27ed22579fd9 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -973,19 +973,23 @@ static int unmap_and_move_huge_page(new_page_t get_new_page, } /* - * migrate_pages + * migrate_pages - migrate the pages specified in a list, to the free pages + * supplied as the target for the page migration * - * The function takes one list of pages to migrate and a function - * that determines from the page to be migrated and the private data - * the target of the move and allocates the page. + * @from: The list of pages to be migrated. + * @get_new_page: The function used to allocate free pages to be used + * as the target of the page migration. + * @private: Private data to be passed on to get_new_page() + * @mode: The migration mode that specifies the constraints for + * page migration, if any. + * @reason: The reason for page migration. * - * The function returns after 10 attempts or if no pages - * are movable anymore because to has become empty - * or no retryable pages exist anymore. - * Caller should call putback_lru_pages to return pages to the LRU + * The function returns after 10 attempts or if no pages are movable any more + * because the list has become empty or no retryable pages exist any more. + * The caller should call putback_lru_pages() to return pages to the LRU * or free list only if ret != 0. * - * Return: Number of pages not migrated or error code. + * Returns the number of pages that were not migrated, or an error code. */ int migrate_pages(struct list_head *from, new_page_t get_new_page, unsigned long private, enum migrate_mode mode, int reason)